Don't subract directories

When directories are subtracted in a bundle that has recursive
dependendencies, the directory "owning" bundle isn't clear so rather
than picking a single bundle to house the directory, all bundles will
have the directory instead. This adds a little bloat to bundles but
directories are fairly static so is likely to have very minimal
impact, especially to updates.

Signed-off-by: William Douglas <william.douglas@intel.com>

Author: William Douglas

swupd/manifest.go

@@ -757,9 +757,15 @@ func (m *Manifest) addManifestFiles(ui UpdateInfo, c config) error {
 				if inc.Name == m.Name {
 					continue
 				}
-				if _, ok := inc.BundleInfo.Files[f]; ok {
-					isIncluded = true
-					break
+				chrootDir := filepath.Join(c.imageBase, fmt.Sprint(ui.version), "full")
+				fullPath := filepath.Join(chrootDir, f)
+				if fi, err := os.Lstat(fullPath); err == nil {
+					if !fi.IsDir() {
+						if _, ok := inc.BundleInfo.Files[f]; ok {
+							isIncluded = true
+							break
+						}
+					}
 				}
 			}
 			if !isIncluded {