diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
| commit | 09bb99f8845738fe2a23a45d2505493d61480b5a (patch) | |
| tree | f85ebd1beaed4dbd28766b85c05871bb53cac518 /textw | |
| parent | 46fd98e4e68277e5f11a82e57e94c728d1d1c9b7 (diff) | |
| download | anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.gz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.xz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.zip | |
iutil.getArch now returns s390 for s390x, clean up to handle this nicely
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/complete_text.py | 2 | ||||
| -rw-r--r-- | textw/partition_text.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/textw/complete_text.py b/textw/complete_text.py index 0eb52b460..3d778130e 100644 --- a/textw/complete_text.py +++ b/textw/complete_text.py @@ -30,7 +30,7 @@ class FinishedWindow: else: bootstr = "" - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": floppystr = "" else: floppystr = _("Remove any floppy diskettes you used during the " diff --git a/textw/partition_text.py b/textw/partition_text.py index 6688a72bf..d5205032f 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -943,7 +943,7 @@ class PartitionWindow: if type == "RAID": self.editRaidRequest(request) elif type == "NEW": - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": self.intf.messageWindow(_("Error"), _("You must go back and use fdasd to initialize this partition")) else: @@ -954,8 +954,7 @@ class PartitionWindow: def deleteCb(self): partition = self.lb.current() - if (iutil.getArch() == "s390" or iutil.getArch() == "s390x") \ - and type(partition) != type("RAID"): + if iutil.getArch() == "s390" and type(partition) != type("RAID"): self.intf.messageWindow(_("Error"), _("DASD partitions can only be deleted with fdasd")) return @@ -997,7 +996,7 @@ class PartitionWindow: col_label_align=[CENTER, CENTER,CENTER,CENTER,CENTER,CENTER]) self.g.add(self.lb, 0, 1) - if iutil.getArch() == "s390" or iutil.getArch() == "s390x": + if iutil.getArch() == "s390": self.bb = ButtonBar (screen, ((_("Edit"), "edit", "F3"), (_("Delete"), "delete", "F4"), (_("RAID"), "raid", "F11"), |