diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-10-26 22:59:20 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-10-26 22:59:20 +0000 |
| commit | 5f24cf8eeeb90226232011f080d3356ea7ea7f24 (patch) | |
| tree | f3e86199f2aa0c1e729b593e65c74afc63ab6c6a | |
| parent | d675184ba9ea3fc8aecebd2ed7823f8f57c5142c (diff) | |
| download | anaconda-5f24cf8eeeb90226232011f080d3356ea7ea7f24.tar.gz anaconda-5f24cf8eeeb90226232011f080d3356ea7ea7f24.tar.xz anaconda-5f24cf8eeeb90226232011f080d3356ea7ea7f24.zip | |
2004-10-26 Jeremy Katz <katzj@redhat.com>
* partedUtils.py (DiskSet.openDevices): Don't die if we don't have
an intf set up yet (#130123, #137239)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | partedUtils.py | 9 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2004-10-26 Jeremy Katz <katzj@redhat.com> + * partedUtils.py (DiskSet.openDevices): Don't die if we don't have + an intf set up yet (#130123, #137239) + * upgrade.py (upgradeFindPackages): firefox replaces mozilla/netscape (#137244) diff --git a/partedUtils.py b/partedUtils.py index 0fbb428ef..b7d3cabc4 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -827,6 +827,9 @@ class DiskSet: # FIXME: need the right fix for z/VM formatted dasd if iutil.getArch() == "s390" and drive[:4] == "dasd" and isys.getDasdState(drive): devs = isys.getDasdDevPort() + if intf is None: + DiskSet.skippedDisks.append(drive) + continue rc = intf.messageWindow(_("Warning"), _("The partition table on device %s (%s) was unreadable. " "To create new partitions it must be initialized, " @@ -854,7 +857,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" and drive[:4] == "dasd": - if (self.dasdFmt(intf, drive)): + if (intf is None or self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue else: @@ -902,7 +905,7 @@ class DiskSet: if recreate == 1 and not flags.test: if iutil.getArch() == "s390" and drive[:4] == "dasd": - if (self.dasdFmt(intf, drive)): + if (intf is None or self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue else: @@ -928,7 +931,7 @@ class DiskSet: continue elif ret == -1: if iutil.getArch() == "s390" and drive[:4] == "dasd": - if (self.dasdFmt(intf, drive)): + if (intf is None or self.dasdFmt(intf, drive)): DiskSet.skippedDisks.append(drive) continue else: |