summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-03-31 10:37:09 -0400
committerChris Lumens <clumens@redhat.com>2009-03-31 11:54:46 -0400
commitd45b4edc103720a4493814e2d51ae89c79c08315 (patch)
tree30b0763df65150cfa93d96d690236918409ef53d
parentd383e2ae22a76ae755e5b549ce6d8a299e70ec1d (diff)
downloadanaconda-d45b4edc103720a4493814e2d51ae89c79c08315.tar.gz
anaconda-d45b4edc103720a4493814e2d51ae89c79c08315.tar.xz
anaconda-d45b4edc103720a4493814e2d51ae89c79c08315.zip
If there's a problem finding removable disks, disable save-to-disk.
Catching all exception is really drastic, but this is the exception reporting code and we need it to be resiliant to extra errors so we stand a chance of getting things reported.
-rwxr-xr-xgui.py6
-rw-r--r--text.py6
2 files changed, 10 insertions, 2 deletions
diff --git a/gui.py b/gui.py
index 3c1b6fd29..0f18b7db0 100755
--- a/gui.py
+++ b/gui.py
@@ -743,7 +743,11 @@ class SaveExceptionWindow:
store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
- dests = anaconda.id.storage.exceptionDisks()
+ try:
+ dests = anaconda.id.storage.exceptionDisks()
+ except Exception as e:
+ log.error("Error when probing exception disks: %s" % e)
+ dests = []
if flags.livecdInstall:
self.destCombo.remove_text(0)
diff --git a/text.py b/text.py
index 8d6c6e563..51c02392f 100644
--- a/text.py
+++ b/text.py
@@ -242,7 +242,11 @@ class SaveExceptionWindow:
toplevel.add(scpGrid, 0, 5, (0, 0, 0, 1))
toplevel.add(buttons, 0, 6, growx=1)
- dests = self.anaconda.id.storage.exceptionDisks()
+ try:
+ dests = self.anaconda.id.storage.exceptionDisks()
+ except Exception as e:
+ log.error("Error when probing exception disks: %s" % e)
+ dests = []
if len(dests) > 0:
for (dev, desc) in dests: