diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-10-24 14:33:12 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-10-24 14:33:12 +0000 |
| commit | 7c58b302aa0bbc0ac70d2df8183d0f2e5bf25be6 (patch) | |
| tree | 6878ab5b0a554d2fe3a6eb5a7b9c5419847a893c /textw | |
| parent | fe637833e39ffe1170389f51e4613d8afbcea186 (diff) | |
| download | anaconda-7c58b302aa0bbc0ac70d2df8183d0f2e5bf25be6.tar.gz anaconda-7c58b302aa0bbc0ac70d2df8183d0f2e5bf25be6.tar.xz anaconda-7c58b302aa0bbc0ac70d2df8183d0f2e5bf25be6.zip | |
2006-10-24 Jeremy Katz <katzj@redhat.com>
* textw/partition_text.py: Fix canceling with iscsi (#211996)
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/partition_text.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/textw/partition_text.py b/textw/partition_text.py index 9b7b805e0..6c9fce489 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1642,20 +1642,20 @@ class PartitionTypeWindow: newdrv, [ TEXT_OK_BUTTON, TEXT_BACK_BUTTON], width=55, height=3) - + if button == TEXT_BACK_CHECK: return INSTALL_BACK if choice == 1: try: return self.addZFCPDriveDialog(screen) except ValueError, e: - ButtonChoiceWindow(screen, _("Error"), e) + ButtonChoiceWindow(screen, _("Error"), "%s" %(e,)) return INSTALL_BACK else: try: return self.addIscsiDriveDialog(screen) except ValueError, e: - ButtonChoiceWindow(screen, _("Error"), e) + ButtonChoiceWindow(screen, _("Error"), "%s" %(e,)) return INSTALL_BACK def addZFCPDriveDialog(self, screen): @@ -1665,7 +1665,7 @@ class PartitionTypeWindow: prompts = [ "Device number", "WWPN", "FCP LUN" ] ) - if button == TEXT_BACK_CHECK: + if button == 'cancel': return INSTALL_BACK devnum = entries[0].strip() @@ -1688,7 +1688,8 @@ class PartitionTypeWindow: _("To use iSCSI disks, you must provide the address of your iSCSI target and the iSCSI initiator name you've configured for your host."), prompts = [ "Target IP Address", "iSCSI Initiator Name" ]) - if button == TEXT_BACK_CHECK: + + if button == 'cancel': return INSTALL_BACK target = entries[0].strip() |