summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-02-22 20:40:48 +0000
committerChris Lumens <clumens@redhat.com>2007-02-22 20:40:48 +0000
commite7b2f4c2c2c863cfaee678158cd0856325b6a662 (patch)
treec078ea4c5f2f1e0d9c6916c01745c42344058729
parent48aa5f929db9a550baa0cf3daa33f4c171dc77e8 (diff)
downloadanaconda-e7b2f4c2c2c863cfaee678158cd0856325b6a662.tar.gz
anaconda-e7b2f4c2c2c863cfaee678158cd0856325b6a662.tar.xz
anaconda-e7b2f4c2c2c863cfaee678158cd0856325b6a662.zip
Fix traceback when cancel is pressed (#229694).
-rw-r--r--ChangeLog4
-rw-r--r--textw/partition_text.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index db1c40d34..005396e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
* scripts/maketreeinfo.py: Fix typo.
+ * textw/partition_text.py (PartitionTypeWindow.addIscsiDriveDialog):
+ Fix traceback when cancel is pressed (#229694).
+ (PartitionTypeWindow.addZFCPDriveDialog): Likewise.
+
2007-02-21 Dave Lehman <dlehman@redhat.com>
* partedUtils.py (openDevices): don't relabel disks that contain
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 2bb8cfa6e..3420591c8 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -1683,7 +1683,7 @@ class PartitionTypeWindow:
prompts = [ "Device number",
"WWPN",
"FCP LUN" ] )
- if button == TEXT_BACK_CHECK:
+ if button == TEXT_CANCEL_CHECK:
return INSTALL_BACK
devnum = entries[0].strip()
@@ -1706,7 +1706,7 @@ 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 == TEXT_CANCEL_CHECK:
return INSTALL_BACK
target = entries[0].strip()