summaryrefslogtreecommitdiffstats
path: root/storage/__init__.py
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2009-04-20 17:51:43 -0500
committerDavid Lehman <dlehman@redhat.com>2009-04-21 10:14:24 -0500
commit2b2be94b0ba5e88cf394e8e49002bbfaff30e9ed (patch)
tree82c2e1f25aa371732daa15c5a67b03f4c9ab88bd /storage/__init__.py
parent002738d7d80d2ab7f601be8b53ad88a0976feef0 (diff)
downloadanaconda-2b2be94b0ba5e88cf394e8e49002bbfaff30e9ed.tar.gz
anaconda-2b2be94b0ba5e88cf394e8e49002bbfaff30e9ed.tar.xz
anaconda-2b2be94b0ba5e88cf394e8e49002bbfaff30e9ed.zip
Include the device path in DeviceError exceptions.
Diffstat (limited to 'storage/__init__.py')
-rw-r--r--storage/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/__init__.py b/storage/__init__.py
index e5dba78a9..13f34f99f 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1454,20 +1454,20 @@ class FSSet(object):
intf.messageWindow(_("Error"), msg)
sys.exit(0)
- except DeviceError as msg:
+ except DeviceError as (msg, path):
if intf:
if upgrading:
err = _("Error enabling swap device %s: %s\n\n"
"The /etc/fstab on your upgrade partition "
"does not reference a valid swap "
"device.\n\nPress OK to exit the "
- "installer") % (device.path, msg)
+ "installer") % (path, msg)
else:
err = _("Error enabling swap device %s: %s\n\n"
"This most likely means this swap "
"device has not been initialized.\n\n"
"Press OK to exit the installer.") % \
- (device.path, msg)
+ (path, msg)
intf.messageWindow(_("Error"), err)
sys.exit(0)