From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 8 Sep 2009 17:32:45 +0000 (+0000)
Subject: Attempt to fix a bug related to BeRTOS upgrade in Wizard
X-Git-Tag: 2.2.0~58
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2156a825ba83da6e71a78237285a5558956da549;p=bertos.git

Attempt to fix a bug related to BeRTOS upgrade in Wizard

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2910 38d2e660-2303-0410-9eaa-f027e97ec537
---

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")