From 2c462c3f36e016ef92f92e6990b7c4b1e7079f60 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 21 Dec 2023 13:28:00 +0100 Subject: [PATCH] cleaning --- dotdrop/cfg_yaml.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py index c6e800b..5d2c701 100644 --- a/dotdrop/cfg_yaml.py +++ b/dotdrop/cfg_yaml.py @@ -1709,11 +1709,13 @@ class CfgYaml: if k not in final: final[k] = [] final[k] += val + elif isinstance(val, str): + final[k] = val else: # don't know how to handle - # err = 'unable to merge' - # raise YamlException(err) - final[k] = val + err = 'unable to merge' + raise YamlException(err) + return final @classmethod