Merge pull request #2653 from alyssarosenzweig/bug/custom-exclude-fs

Conan-Kudo · web-flow · commit ddc7ad082546 · 2024-09-24T15:32:26.000-04:00
Honour custom exclude for filesystem builds
diff --git a/kiwi/builder/filesystem.py b/kiwi/builder/filesystem.py
@@ -205,5 +205,6 @@ def _operate_on_file(self) -> None:
         ) as filesystem:
             filesystem.create_on_file(
                 self.filename, self.label,
-                Defaults.get_exclude_list_for_root_data_sync()
+                Defaults.get_exclude_list_for_root_data_sync() + Defaults.
+                get_exclude_list_from_custom_exclude_files(self.root_dir)
             )

Original file line number	Diff line number	Diff line change
`@@ -205,5 +205,6 @@ def _operate_on_file(self) -> None:`
`205`	`205`	`) as filesystem:`
`206`	`206`	`filesystem.create_on_file(`
`207`	`207`	`self.filename, self.label,`
`208`		`- Defaults.get_exclude_list_for_root_data_sync()`
	`208`	`+ Defaults.get_exclude_list_for_root_data_sync() + Defaults.`
	`209`	`+ get_exclude_list_from_custom_exclude_files(self.root_dir)`
`209`	`210`	`)`