]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: rename local variable shadowing builtin
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 19 Mar 2013 20:51:54 +0000 (21:51 +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 57dde5c8b18ff4ccd53a30bb94119c0ffceb52b7)

src/ceph-disk

index 0478eae4e8ca798dda5317944bb6a5597d7730a9..979ba8bfd23a876183c609ceb618ba5ebc52a2c2 100755 (executable)
@@ -204,10 +204,10 @@ def is_held(dev):
     disk = base
     while disk[-1].isdigit():
         disk = disk[:-1]
-    dir = '/sys/block/{disk}/{base}/holders'.format(disk=disk, base=base)
-    if not os.path.exists(dir):
+    directory = '/sys/block/{disk}/{base}/holders'.format(disk=disk, base=base)
+    if not os.path.exists(directory):
         return []
-    return os.listdir(dir)
+    return os.listdir(directory)
 
 
 def verify_not_in_use(dev):