[PATCH] Handle invalid spoke input (#853253)

Jesse Keating jkeating at redhat.com
Fri Aug 31 23:35:12 UTC 2012


---
 pyanaconda/ui/tui/spokes/storage.py | 4 ++--
 pyanaconda/ui/tui/spokes/time.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 40a167a..d1b85c3 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -207,7 +207,7 @@ class StorageSpoke(NormalTUISpoke):
             self._update_disk_list(self.disks[number -1])
             return None
 
-        except (ValueError, KeyError):
+        except (ValueError, KeyError, IndexError):
             return key
 
     def apply(self):
@@ -345,5 +345,5 @@ class AutoPartSpoke(NormalTUISpoke):
             self.close()
             return False
 
-        except (ValueError, KeyError):
+        except (ValueError, KeyError, IndexError):
             return key
diff --git a/pyanaconda/ui/tui/spokes/time.py b/pyanaconda/ui/tui/spokes/time.py
index bac1d0f..2cea1b8 100644
--- a/pyanaconda/ui/tui/spokes/time.py
+++ b/pyanaconda/ui/tui/spokes/time.py
@@ -99,7 +99,7 @@ class TimeZoneSpoke(NormalTUISpoke):
                 else:
                     self.app.switch_screen(self, self._regions[keyid])
             return True
-        except ValueError:
+        except (ValueError, IndexError):
             pass
 
         if key.lower() in self._lower_zones:
-- 
1.7.11.2



More information about the anaconda-patches mailing list