Merge lp:~lamont/maas/atomic-delete-1.8 into lp:maas/1.8

[LaMont Jones]

Have atomic_delete use the same directory for the removal, like it claims to. This avoids failures do to cross-device links in rename().

Backport from trunk:

Have atomic_delete use the same directory for the removal, like it claims to. This avoids failures do to cross-device links in rename().

[MAAS Lander (maas-lander)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

[LaMont Jones (lamont)]

trivial backport

review: Approve

=== modified file 'src/provisioningserver/utils/fs.py'
--- src/provisioningserver/utils/fs.py	2015-08-15 00:26:15 +0000
+++ src/provisioningserver/utils/fs.py	2015-10-14 19:54:49 +0000
@@ -142,7 +142,8 @@
     will be on the same filesystem as the destination) and then deletes the
     temporary file. Such a rename is atomic in POSIX.
     """
-    del_filename = ".%s.del" % os.path.basename(filename)
+    del_filename = "%s/.%s.del" % (
+        os.path.dirname(filename), os.path.basename(filename))
     rename(filename, del_filename)
     os.remove(del_filename)
 

=== modified file 'src/provisioningserver/utils/tests/test_fs.py'
--- src/provisioningserver/utils/tests/test_fs.py	2015-08-17 15:42:00 +0000
+++ src/provisioningserver/utils/tests/test_fs.py	2015-10-14 19:54:49 +0000
@@ -190,7 +190,8 @@
 
     def test_renames_file_before_deleting(self):
         filename = self.make_file()
-        del_filename = ".%s.del" % os.path.basename(filename)
+        del_filename = "%s/.%s.del" % (
+            os.path.dirname(filename), os.path.basename(filename))
         self.addCleanup(os.remove, del_filename)
         mock_remove = self.patch(fs_module.os, "remove")
         atomic_delete(filename)