From 72e6668c172b6b8a83d4a9d9ffb052e28ea1f470 Mon Sep 17 00:00:00 2001 From: Simone Margaritelli Date: Mon, 7 Oct 2019 20:50:46 +0200 Subject: [PATCH] fix: fixed config merge with user config exists but it's empty --- pwnagotchi/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pwnagotchi/utils.py b/pwnagotchi/utils.py index e6e15f53..8c30e946 100644 --- a/pwnagotchi/utils.py +++ b/pwnagotchi/utils.py @@ -20,13 +20,15 @@ def merge_config(user, default): def load_config(args): - with open(args.config, 'rt') as fp: + with open(args.config) as fp: config = yaml.safe_load(fp) if os.path.exists(args.user_config): - with open(args.user_config, 'rt') as fp: + with open(args.user_config) as fp: user_config = yaml.safe_load(fp) - config = merge_config(user_config, config) + # if the file is empty, safe_load will return None and merge_config will boom. + if user_config: + config = merge_config(user_config, config) return config