Skip to content

Commit

Permalink
Merge pull request #3079 from gleidi-suse/product-composer-fix
Browse files Browse the repository at this point in the history
pkglistgen.py: Run product-composer iif there's a *.productcompose.in file and a 000productcompose directory.
  • Loading branch information
gleidi-suse committed May 14, 2024
2 parents 91ddc8a + c120c9b commit ed30d28
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkglistgen/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -769,9 +769,7 @@ def update_and_solve_target(

# new product-composer
fn = os.path.join(group_dir, 'default.productcompose.in')
if os.path.isfile(fn):
if not os.path.isdir(self.productcompose_dir):
raise Exception('default.productcompose.in exists, but output directory is missing in git!')
if os.path.isfile(fn) and os.path.isdir(self.productcompose_dir):
lines = open(fn).readlines()
new_lines = []
for line in lines:
Expand All @@ -789,6 +787,7 @@ def update_and_solve_target(
else:
# No template file, so we don't create one either
self.skip_productcompose = True
logging.debug('skipping productcompose')

logging.debug('-> do_update')
# make sure we only calculcate existant architectures
Expand Down

0 comments on commit ed30d28

Please sign in to comment.