diff options
| author | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-04-02 17:17:38 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-26 13:40:07 -0700 |
| commit | 14a348dc8ea9c012b6843825fd7beb5896a6d92e (patch) | |
| tree | d252b23a9b7739a7a25b553b4193d807c32501d8 | |
| parent | 9419dca69292146ea1fd216a1ad08b2e07bdc1a0 (diff) | |
| download | ceph-14a348dc8ea9c012b6843825fd7beb5896a6d92e.tar.gz | |
ceph-disk: fix Redefining name 'uuid' from outer scope
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 058eb923c5b7dab611901fdd1724ce2a7c180827)
| -rwxr-xr-x | src/ceph-disk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ceph-disk b/src/ceph-disk index 3be0618301e..740318b4ec9 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -1715,9 +1715,9 @@ def list_dev(dev, uuid_map, journal_map): desc = ['ceph data', 'unprepared'] elif ptype == 'ceph journal': desc.append('ceph journal') - uuid = get_partition_uuid(dev) - if uuid and uuid in journal_map: - desc.append('for %s' % journal_map[uuid]) + part_uuid = get_partition_uuid(dev) + if part_uuid and part_uuid in journal_map: + desc.append('for %s' % journal_map[part_uuid]) else: if is_swap(dev): desc.append('swap') @@ -1742,9 +1742,9 @@ def main_list(args): for base, parts in sorted(partmap.iteritems()): for p in parts: dev = '/dev/' + p - uuid = get_partition_uuid(dev) - if uuid: - uuid_map[uuid] = dev + part_uuid = get_partition_uuid(dev) + if part_uuid: + uuid_map[part_uuid] = dev ptype = get_partition_type(dev) if ptype == 'ceph data': fs = get_dev_fs(dev) |