X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=2b7d6767e2a8235e9b58850f7ef74eb2878b6e23;hb=e5342297fe73a412dfc0d22bac403f30b05e3bc0;hp=463051e6165f4d560d36c94b45e4c044f7867684;hpb=a861d8e4e8a484679865bf5cd4e26954f76452da;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 463051e6..2b7d6767 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -89,8 +89,13 @@ def loadBertosProject(project_file):
     return project_info
 
 def mergeSources(srcdir, new_sources, old_sources):
+    # The current mergeSources function provide only a raw copy of the sources in the
+    # created project.
+    #
     # TODO: implement the three way merge algorithm
-    pass
+    #
+    shutil.rmtree(srcdir, True)
+    copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
 
 def projectFileGenerator(project_info):
     directory = project_info.info("PROJECT_PATH")
@@ -674,7 +679,8 @@ def loadConfigurationInfos(path):
 
 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):