ceph-disk: conditionally remove mount path

umount removes it on success; only remove it here if it is still there.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 4362934a94c5a6f7521f06aa1255e111094e1d88)

diff --git a/src/ceph-disk b/src/ceph-disk
index 3579765ac002493b3e3350a06eff79de0b916497..5c5f82ad00725891787544480e094f7ddc00dae3 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1380,8 +1380,9 @@ def mount_activate(
         unmount(path)
         raise
     finally:
-        # remove out temp dir
-        os.rmdir(path)
+        # remove our temp dir
+        if os.path.exists(path):
+            os.rmdir(path)
 
 
 def activate_dir(