1492 - migration fails when /v1 directory already exists

closes #1492 https://pulp.plan.io/issues/1492
pulp · Feb 2, 2016 · 9ab1c65 · 9ab1c65
1 parent 9870a14
commit 9ab1c65
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/plugins/pulp_docker/plugins/migrations/0001_v2_support.py b/plugins/pulp_docker/plugins/migrations/0001_v2_support.py
@@ -22,9 +22,10 @@ def migrate():
     for folder in os.listdir(OLD_DOCKER_V1_PUBLISH_PATH):
         if folder == 'v1':
             continue
-        folder = os.path.join(OLD_DOCKER_V1_PUBLISH_PATH, folder)
-        if os.path.exists(folder):
-            shutil.move(folder, NEW_DOCKER_V1_PUBLISH_PATH)
+        source_folder = os.path.join(OLD_DOCKER_V1_PUBLISH_PATH, folder)
+        destination_folder = os.path.join(NEW_DOCKER_V1_PUBLISH_PATH, folder)
+        if os.path.exists(source_folder) and not os.path.exists(destination_folder):
+            shutil.move(source_folder, NEW_DOCKER_V1_PUBLISH_PATH)
 
     # Now we must look for and repair broken symlinks
     _repair_links()