summaryrefslogtreecommitdiffstats
path: root/text.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-01-27 14:58:46 -0500
committerDavid Cantrell <dcantrell@redhat.com>2009-02-12 11:29:41 -1000
commitca1472b789e1555a7b0c5ee817e89c9b98cb9706 (patch)
tree83c1842694b06191578d56b7a0260aaef4a9143b /text.py
parente4ceb72d7a801eeaeefbadd0fa672199e10fe0b4 (diff)
downloadanaconda-ca1472b789e1555a7b0c5ee817e89c9b98cb9706.tar.gz
anaconda-ca1472b789e1555a7b0c5ee817e89c9b98cb9706.tar.xz
anaconda-ca1472b789e1555a7b0c5ee817e89c9b98cb9706.zip
Don't provide a special partedExceptionWindow anymore.
Since pyparted has a lot more execption classes now, it makes sense to just let anaconda's regular exception handling framework deal with them. This means a lot of changes throughout are on the way.
Diffstat (limited to 'text.py')
-rw-r--r--text.py30
1 files changed, 0 insertions, 30 deletions
diff --git a/text.py b/text.py
index a632b782d..e518e84f5 100644
--- a/text.py
+++ b/text.py
@@ -557,34 +557,6 @@ class InstallInterface:
win = SaveExceptionWindow (anaconda, longTextFile, self.screen)
return win
- def partedExceptionWindow(self, exc):
- # if our only option is to cancel, let us handle the exception
- # in our code and avoid popping up the exception window here.
- if exc.options == parted.EXCEPTION_CANCEL:
- return parted.EXCEPTION_UNHANDLED
- log.critical("parted exception: %s: %s" %(exc.type_string,exc.message))
- buttons = []
- buttonToAction = {}
- flags = ((parted.EXCEPTION_FIX, N_("Fix")),
- (parted.EXCEPTION_YES, N_("Yes")),
- (parted.EXCEPTION_NO, N_("No")),
- (parted.EXCEPTION_OK, N_("OK")),
- (parted.EXCEPTION_RETRY, N_("Retry")),
- (parted.EXCEPTION_IGNORE, N_("Ignore")),
- (parted.EXCEPTION_CANCEL, N_("Cancel")))
- for flag, errorstring in flags:
- if exc.options & flag:
- buttons.append(_(errorstring))
- buttonToAction[string.lower(_(errorstring))] = flag
-
- rc = None
- while not buttonToAction.has_key(rc):
- rc = ButtonChoiceWindow(self.screen, exc.type_string, exc.message,
- buttons=buttons)
-
- return buttonToAction[rc]
-
-
def waitWindow(self, title, text):
return WaitWindow(self.screen, title, text)
@@ -661,8 +633,6 @@ class InstallInterface:
anaconda.id.fsset.registerProgressWindow(self.progressWindow)
anaconda.id.fsset.registerWaitWindow(self.waitWindow)
- parted.exception_set_handler(self.partedExceptionWindow)
-
lastrc = INSTALL_OK
(step, instance) = anaconda.dispatch.currentStep()
while step: