summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2010-05-07 11:59:19 -1000
committerDavid Cantrell <dcantrell@redhat.com>2010-05-07 16:24:05 -1000
commit65efba3e150b174cc97ef903cd2454743b333725 (patch)
tree1131165ebf34af09a015e7c8149df8ae615226d0
parent16dd4bc06441bb21e1bc200a078f01c15b22e512 (diff)
downloadanaconda-65efba3e150b174cc97ef903cd2454743b333725.tar.gz
anaconda-65efba3e150b174cc97ef903cd2454743b333725.tar.xz
anaconda-65efba3e150b174cc97ef903cd2454743b333725.zip
Fix usage of deviceNameToDiskByPath in devicetree.py (#589967)
Account for the recent changes in deviceNameToDiskByPath().
-rw-r--r--storage/devicetree.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/devicetree.py b/storage/devicetree.py
index d788e37a8..5c4df8ea6 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -1365,10 +1365,12 @@ class DeviceTree(object):
initcb = lambda: True
else:
description = device.description or device.model
- bypath = os.path.basename(deviceNameToDiskByPath(device.name))
+ bypath = deviceNameToDiskByPath(device.name)
if bypath:
+ bypath = os.path.basename(bypath)
details = "\n\nDevice details:\n%s" % (bypath,)
else:
+ bypath = device.name
details = ""
initcb = lambda: self.intf.questionInitializeDisk(bypath,