projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to fix a bug related to BeRTOS upgrade in Wizard
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index f509a4c2430055680334b2856fc9994389ee6fe8..363b08b5e182e5e1f5573aa04ce27336cfff9e8d 100644
(file)
--- 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)
# 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")
def projectFileGenerator(project_info):
directory = project_info.info("PROJECT_PATH")