From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 19 Mar 2013 21:05:23 +0000 (+0100)
Subject: ceph-disk: remove twice defined identical function unmount
X-Git-Tag: v0.56.5~5^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd1036dd83fa2ee4807047fb9c2b414ccc9375eb;p=ceph.git

ceph-disk: remove twice defined identical function unmount

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 4adf088107586be7b356d1e963570cdab232809e)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 20f004558a61..90fbe52ae38a 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -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,