projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the settings merge function
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index 401713f61a4f010a21a68440357b7f2fd13f7f7f..2b7d6767e2a8235e9b58850f7ef74eb2878b6e23 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-679,7
+679,8
@@
def loadConfigurationInfos(path):
def updateConfigurationValues(def_conf, user_conf):
for param in def_conf["paramlist"]:
def updateConfigurationValues(def_conf, user_conf):
for param in def_conf["paramlist"]:
- def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
+ if param[1] in user_conf and "value" in user_conf[param[1]]:
+ def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
return def_conf
def findParameterType(parameter):
return def_conf
def findParameterType(parameter):