Changes merged
authorlaurent
Thu, 10 Dec 2009 12:31:42 +0100
changeset 501 d7bf56b036a8
parent 500 af7c28de4cc7 (current diff)
parent 498 c78246f3b85b (diff)
child 502 5343ae43f6d0
Changes merged
LPCBeremiz.py
--- a/LPCBeremiz.py	Thu Dec 10 12:30:49 2009 +0100
+++ b/LPCBeremiz.py	Thu Dec 10 12:31:42 2009 +0100
@@ -347,7 +347,8 @@
             srcpath = os.path.join(src,i)
             dstpath = os.path.join(dst,i)
             if os.path.isdir(srcpath):
-                os.makedirs(dstpath)
+                if not os.path.exists(dstpath):
+                    os.makedirs(dstpath)
                 mycopytree(srcpath, dstpath)
             elif os.path.isfile(srcpath):
                 shutil.copy2(srcpath, dstpath)
--- a/targets/LPC/plc_LPC_main.c	Thu Dec 10 12:30:49 2009 +0100
+++ b/targets/LPC/plc_LPC_main.c	Thu Dec 10 12:31:42 2009 +0100
@@ -94,7 +94,7 @@
 }
 
 void Retain(unsigned int offset, unsigned int count, void *p)
-{t
+{
 }
 
 void Remind(unsigned int offset, unsigned int count, void *p)