Don't add direct include bundle packages

Direct include packages being accounted for causing the chroot bundle
to be content beyond the package. This might be worth hiding behind a
bundle config flag setting at some point but for now just disable.

Author: bryteise

builder/bundles.go

@@ -404,6 +404,22 @@ func resolvePackagesWithOptions(numWorkers int, set bundleSet, packagerCmd []str
 				return
 			}
 
+			singlePkgMap := make(repoPkgMap)
+			for _, pkgs := range rpm {
+				for _, pkg := range pkgs {
+					if pkg.name == bundle.Name {
+						singlePkgMap[pkg.repo] = append(singlePkgMap[pkg.repo], pkg)
+						break
+					}
+				}
+				if len(singlePkgMap) > 0 {
+					break
+				}
+			}
+			if len(singlePkgMap) > 0 {
+				rpm = singlePkgMap
+			}
+
 			for _, pkgs := range rpm {
 				// Add packages to bundle's AllPackages
 				for _, pkg := range pkgs {

builder/bundleset.go

@@ -58,11 +58,6 @@ func validateAndFillBundleSet(bundles bundleSet) error {
 		for k, v := range b.DirectPackages {
 			b.AllPackages[k] = v
 		}
-		for _, include := range b.DirectIncludes {
-			for k, v := range bundles[include].AllPackages {
-				b.AllPackages[k] = v
-			}
-		}
 	}
 
 	return nil