diff options
| author | Karsten Hopp <karsten@redhat.de> | 2004-08-02 13:02:41 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.de> | 2004-08-02 13:02:41 +0000 |
| commit | e5ebd6466f500f049514e5b2a4b856a48ce93c45 (patch) | |
| tree | b4a35f5c30722c0d84d1293b3f424f7940e53fbf /partedUtils.py | |
| parent | 5ac34414c7576d30c314a5a1f958e2c4e7b7cf1c (diff) | |
| download | anaconda-e5ebd6466f500f049514e5b2a4b856a48ce93c45.tar.gz anaconda-e5ebd6466f500f049514e5b2a4b856a48ce93c45.tar.xz anaconda-e5ebd6466f500f049514e5b2a4b856a48ce93c45.zip | |
mainframe now have harddisks other than DASD, don't try to run dasdfmt on FCP disks. Some indentation cleanup
Diffstat (limited to 'partedUtils.py')
| -rw-r--r-- | partedUtils.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/partedUtils.py b/partedUtils.py index a4fe10589..85aaa7a2e 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -4,6 +4,7 @@ # Matt Wilson <msw@redhat.com> # Jeremy Katz <katzj@redhat.com> # Mike Fulbright <msf@redhat.com> +# Karsten Hopp <karsten@redhat.com> # # Copyright 2002-2003 Red Hat, Inc. # @@ -817,7 +818,7 @@ class DiskSet: DiskSet.skippedDisks.append(drive) continue # FIXME: need the right fix for z/VM formatted dasd - if iutil.getArch() == "s390" and isys.getDasdState(drive): + if iutil.getArch() == "s390" and drive[:4] == "dasd" and isys.getDasdState(drive): devs = isys.getDasdDevPort() rc = intf.messageWindow(_("Warning"), _("The partition table on device %s (%s) was unreadable. " @@ -845,7 +846,7 @@ class DiskSet: if (initAll and ((clearDevs is None) or (len(clearDevs) == 0) or drive in clearDevs) and not flags.test): - if iutil.getArch() == "s390": + if iutil.getArch() == "s390" and drive[:4] == "dasd": if (self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue @@ -880,11 +881,11 @@ class DiskSet: _("The partition table on device %s was unreadable. " "To create new partitions it must be initialized, " "causing the loss of ALL DATA on this drive.\n\n" - "This operation will override any previous " - "installation choices about which drives to " - "ignore.\n\n" + "This operation will override any previous " + "installation choices about which drives to " + "ignore.\n\n" "Would you like to initialize this drive, " - "erasing ALL DATA?") + "erasing ALL DATA?") % (format,), type = "yesno") if rc == 0: DiskSet.skippedDisks.append(drive) @@ -893,7 +894,7 @@ class DiskSet: recreate = 1 if recreate == 1 and not flags.test: - if iutil.getArch() == "s390": + if iutil.getArch() == "s390" and drive[:4] == "dasd": if (self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue @@ -919,7 +920,7 @@ class DiskSet: DiskSet.skippedDisks.append(drive) continue elif ret == -1: - if iutil.getArch() == "s390": + if iutil.getArch() == "s390" and drive[:4] == "dasd": if (self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue |