Merge pull request #125 from ks156/next

Fixed a bug with the duplication from sd to flash
nodesign · Feb 2, 2015 · 6804827 · 6804827
2 parents c43ff5a + e3d3394
commit 6804827
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/handlers/dashboardHandler.py b/handlers/dashboardHandler.py
@@ -48,7 +48,7 @@
 ###
 
 
-import os, signal, sys, platform, subprocess, datetime
+import os, signal, sys, platform, subprocess, datetime, shutil
 from os.path import isfile, join
 
 from tornado import web, ioloop, iostream, gen
@@ -325,7 +325,10 @@ def duplicateProject(self, rq):
         if (len(path)>0):
             if (storage != "sd" and storage != "usbFlash"):
                 # Destroy symlink
-                os.remove(config["last_opened_project"]+"/www")
+                if os.path.islink(config["last_opened_project"]+"/www"):
+                    os.remove(config["last_opened_project"]+"/www")
+                else:
+                    shutil.rmtree(config["last_opened_project"]+"/www")
                 # copy all files
                 try:
                     copytree(config["last_opened_project"], path)
@@ -340,7 +343,7 @@ def duplicateProject(self, rq):
 
             if (storage != "sd" and storage != "usbFlash"):
                 # Recreate symlink
-                os.symlink(config["absolut_root_path"] + "/www/", config["last_opened_project"] + "/www")
+                os.symlink(config["absolut_root_path"] + "/www/", path + "/www")
             else:
                 if not (os.path.exists(path + "/www")):
                     copytree(config["absolut_root_path"] + "/www/", path + "/www", ignore=ignore_patterns('sd', 'flash', 'examples', 'usbFlash'))