]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: remove twice defined identical function unmount
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 19 Mar 2013 21:05:23 +0000 (22:05 +0100)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 20:40:04 +0000 (13:40 -0700)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 4adf088107586be7b356d1e963570cdab232809e)

src/ceph-disk

index 20f004558a618a402f73dca147395a1ee676e296..90fbe52ae38acdbc8601c3dcf246f78af3cbefcd 100755 (executable)
@@ -517,7 +517,7 @@ def unmount(
         log.debug('Unmounting %s', path)
         subprocess.check_call(
             args=[
-                'umount',
+                '/bin/umount',
                 '--',
                 path,
                 ],
@@ -1210,20 +1210,6 @@ def detect_fstype(
     return fstype
 
 
-def unmount(
-    path,
-    ):
-    try:
-        subprocess.check_call(
-            args=[
-                '/bin/umount',
-                '--',
-                path,
-                ],
-            )
-    except subprocess.CalledProcessError as e:
-        raise UnmountError(e)
-
 def mount_activate(
     dev,
     activate_key_template,