[PATCH] Revert "DeviceError only returns a message, not (message, device) tuple (#496343)."

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This reverts commit 7d2799eb905fae1d28607ae3adf3a2929c7e6ece. I changed
the places we raise DeviceError to also raise the device path, so this
change is not necessary.
---
 packages.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages.py b/packages.py
index 275c7c7..3345777 100644
--- a/packages.py
+++ b/packages.py
@@ -141,10 +141,10 @@ def turnOnFilesystems(anaconda):
                                 type = "custom",
                                 custom_buttons = [_("_Exit installer")])
             sys.exit(1)
-        except DeviceError as msg:
+        except DeviceError as (msg, device):
             anaconda.intf.detailedMessageWindow(_("Device Setup Failed"),
                                 _("An error was encountered while "
-                                  "activating your storage configuration."),
+                                  "setting up device %s.") % (device,),
                                 msg,
                                 type = "custom",
                                 custom_buttons = [_("_Exit installer")])
-- 
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux