Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include images.sh sources in source logs #149

Merged
merged 2 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion kiwi_keg/source_info_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/data/output/leap-jeos/log_sources_Blue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/data/output/leap-jeos/log_sources_Orange
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading