Merge pull request #149 from SUSE-Enceladus/fix-src-info-images-sh

Include images.sh sources in source logs
SUSE-Enceladus · Dec 8, 2023 · f08eb24 · f08eb24
2 parents e5b23ae + b9a6a17
commit f08eb24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/kiwi_keg/source_info_generator.py b/kiwi_keg/source_info_generator.py
@@ -181,7 +181,9 @@ def _get_script_sources(self, profile=''):
             os.path.join(x, 'scripts') for x in self.image_definition.data_roots
             if os.path.exists(os.path.join(x, 'scripts'))
         ]
-        for config_sect in self.image_definition.data.get('config', []):
+        script_sects = self.image_definition.data.get('config', []).copy()
+        script_sects += self.image_definition.data.get('setup', [])
+        for config_sect in script_sects:
             profiles = self._get_profiles_attrib(config_sect)
             if profiles and profile not in profiles:
                 continue

diff --git a/test/data/output/leap-jeos/log_sources_Blue b/test/data/output/leap-jeos/log_sources_Blue
@@ -119,6 +119,7 @@ range:1:3:../data/images/leap-jeos/15.2/image.yaml
 range:10:10:../data/images/leap-jeos/15.2/image.yaml
 range:11:11:../data/images/leap-jeos/15.2/image.yaml
 ../data/data/scripts/base-stuff.sh
+../data/data/scripts/base-stuff.sh
 ../data/data/scripts/blue-stuff.sh
 ../data/data/scripts/common-stuff.sh
 range:58:58:../data/images/leap-jeos/content.yaml

diff --git a/test/data/output/leap-jeos/log_sources_Orange b/test/data/output/leap-jeos/log_sources_Orange
@@ -113,6 +113,7 @@ range:1:3:../data/images/leap-jeos/15.2/image.yaml
 range:10:10:../data/images/leap-jeos/15.2/image.yaml
 range:11:11:../data/images/leap-jeos/15.2/image.yaml
 ../data/data/scripts/base-stuff.sh
+../data/data/scripts/base-stuff.sh
 ../data/data/scripts/orange-stuff.sh
 ../data/data/scripts/common-stuff.sh
 range:58:58:../data/images/leap-jeos/content.yaml