From 2cfbafc6534ebcca7e8d52be263aed4d54c04914 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 15 Sep 2021 19:16:30 +0200 Subject: More error handling and fixed a spelling error. --- examples/guided.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/guided.py b/examples/guided.py index e5cf2d38..10f4c9eb 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -56,14 +56,17 @@ def load_config(): archinstall.storage['_selected_servers'] = archinstall.arguments.get('servers', None) if archinstall.arguments.get('disk_layouts', None) is not None: if (dl_path := pathlib.Path(archinstall.arguments['disk_layouts'])).exists() and str(dl_path).endswith('.json'): - with open(dl_path) as fh: - archinstall.arguments['disk_layouts'] = json.load(fh) + try: + with open(dl_path) as fh: + archinstall.arguments['disk_layouts'] = json.load(fh) + except Exception as e: + raise ValueError(f"--disk_layouts does not contain a valid JSON format: {e}") else: try: archinstall.arguments['disk_layouts'] = json.loads(archinstall.arguments['disk_layouts']) except: raise ValueError("--disk_layouts= needs either a JSON file or a JSON string given with a valid disk layout.") - archinstall.storage['disk_layouts'] = {archinstall.BlockDevice(disk) : struct for disk, struct in archinstall.arguments['disk_layouts']} + archinstall.storage['disk_layouts'] = {archinstall.BlockDevice(disk) : struct for disk, struct in archinstall.arguments['disk_layouts'].items()} def ask_user_questions(): -- cgit v1.2.3-54-g00ecf