gnunux/risotto
1
0
Fork 0
forked from stove/risotto
Code Issues Pull requests Projects Releases Wiki Activity

src/risotto/image.py: display depends if failed

Browse source
This commit is contained in:
Emmanuel Garette 2022-10-17 18:49:34 +02:00
parent 74878cae0f
commit 34d277d80f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/risotto/image.py
View file

@ -163,8 +163,8 @@ def load_applicationservice(appname: str,
suppliers.setdefault(supplier, []) suppliers.setdefault(supplier, [])
if appname not in suppliers[supplier]: if appname not in suppliers[supplier]:
suppliers[supplier].append(appname) suppliers[supplier].append(appname)
if 'distribution' in app: if 'distribution' in app and app['distribution']:
distribution = app['distribution'] distribution = appname
else: else:
distribution = None distribution = None
for xml in app.get('depends', []): for xml in app.get('depends', []):
@ -181,7 +181,7 @@ def load_applicationservice(appname: str,
) )
if ret: if ret:
if distribution: if distribution:
raise Exception(f'duplicate distribution for {cfg.module_name} ({distribution} and {ret})') raise Exception(f'duplicate distribution for {cfg.module_name}: {distribution} and {ret} (dependencies: {cfg.depends}) ')
distribution = ret distribution = ret
return distribution return distribution
@ -209,7 +209,7 @@ def load_image_informations(module_name: str,
) )
if ret: if ret:
if distribution: if distribution:
raise Exception(f'duplicate distribution for {cfg.module_name} ({distribution} and {ret})') raise Exception(f'duplicate distribution for {cfg.module_name}: {distribution} and {ret} (dependencies: {cfg.depends}) ')
distribution = ret distribution = ret
if module_name != 'host' and not distribution: if module_name != 'host' and not distribution:
raise Exception(f'cannot found any linux distribution for {module_name}') raise Exception(f'cannot found any linux distribution for {module_name}')