From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 19 Mar 2013 20:51:54 +0000 (+0100)
Subject: ceph-disk: rename local variable shadowing builtin
X-Git-Tag: v0.56.5~5^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c46dfb2512d3b55345faed1bebb9204ba07d030;p=ceph.git

ceph-disk: rename local variable shadowing builtin

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

diff --git a/src/ceph-disk b/src/ceph-disk
index 0478eae4e8ca..979ba8bfd23a 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -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):