X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=363b08b5e182e5e1f5573aa04ce27336cfff9e8d;hb=83fc7933f968173822ed3f636d75860d4a747e76;hp=f509a4c2430055680334b2856fc9994389ee6fe8;hpb=8485e3cfe2e7421e1313752f0b802e5ddd55e86b;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index f509a4c2..363b08b5 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -113,7 +113,7 @@ def mergeSources(srcdir, new_sources, old_sources):
     # TODO: implement the three way merge algorithm
     #
     shutil.rmtree(srcdir, True)
-    copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
+    copytree.copytree(os.path.join(new_sources, "bertos"), srcdir, ignore_list=const.IGNORE_LIST)
 
 def projectFileGenerator(project_info):
     directory = project_info.info("PROJECT_PATH")