Move working-directory to master location when permitted.

closes #2237
pulp · Sep 9, 2016 · 8e8d58f · 8e8d58f
1 parent f30fe38
commit 8e8d58f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/server/pulp/plugins/util/publish_step.py b/server/pulp/plugins/util/publish_step.py
@@ -896,7 +896,16 @@ def process_main(self, item=None):
         # for items where http & https are published to a separate directory
 
         _logger.debug('Copying tree from %s to %s' % (self.source_dir, timestamp_master_dir))
-        copytree(self.source_dir, timestamp_master_dir, symlinks=True)
+
+        misc.mkdir(os.path.dirname(timestamp_master_dir))
+
+        try:
+            os.rename(self.source_dir, timestamp_master_dir)
+        except OSError as e:
+            if e.errno == errno.EXDEV:
+                copytree(self.source_dir, timestamp_master_dir, symlinks=True)
+            else:
+                raise
 
         for source_relative_location, publish_location in self.publish_locations:
             if source_relative_location.startswith('/'):

diff --git a/server/test/unit/plugins/util/test_publish_step.py b/server/test/unit/plugins/util/test_publish_step.py
@@ -748,7 +748,7 @@ def test_process_main_only_publish_directory_contents(self):
         touch(sub_file)
 
         # create an existing file that will be maintained
-        existing_file = os.path.join(source_dir, 'bar.html')
+        existing_file = os.path.join(publish_dir, 'existing.html')
         touch(existing_file)
 
         # Create an old directory to test
@@ -757,7 +757,7 @@ def test_process_main_only_publish_directory_contents(self):
         step.process_main()
 
         target_file = os.path.join(publish_dir, 'bar.html')
-        self.assertEquals(True, os.path.exists(target_file))
+        self.assertTrue(os.path.exists(target_file))
         self.assertTrue(os.path.exists(existing_file))
         self.assertEquals(1, len(os.listdir(master_dir)))