Merged PR #736 - Partially addresses #710

Adding in a hard exception if `--config` can't be loaded when given.
This commit is contained in:
Anton Hvornum 2021-11-18 16:15:41 +00:00 committed by GitHub
commit 4e3d2cff0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -49,12 +49,15 @@ def initialize_arguments():
with urllib.request.urlopen(urllib.request.Request(args.config, headers={'User-Agent': 'ArchInstall'})) as response:
config = json.loads(response.read())
except Exception as e:
print(e)
raise ValueError(f"Could not load --config because: {e}")
if args.creds is not None:
with open(args.creds) as file:
config.update(json.load(file))
# Installation can't be silent if config is not passed
config["silent"] = args.silent
for arg in unknowns:
if '--' == arg[:2]:
if '=' in arg:
@ -62,9 +65,12 @@ def initialize_arguments():
else:
key, val = arg[2:], True
config[key] = val
config["script"] = args.script
if args.dry_run is not None:
config["dry-run"] = args.dry_run
return config

View File

@ -96,7 +96,7 @@ class Boot:
if shutdown.exit_code == 0:
storage['active_boot'] = None
else:
raise SysCallError(f"Could not shut down temporary boot of {self.instance}", level=logging.ERROR, fg="red")
raise SysCallError(f"Could not shut down temporary boot of {self.instance}: {shutdown}", exit_code=shutdown.exit_code)
def __iter__(self):
if self.session: