diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-10-25 17:35:32 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-10-25 17:35:32 +0000 |
| commit | 25ca7f9bc5ecec66b730dded8eb71897fb75ccc6 (patch) | |
| tree | 81aa7e6ae6565dbae676002cd4bc9ceb8e05c303 /isys | |
| parent | 2af485d06fd78c69efd191771d9e49aebb475679 (diff) | |
| download | anaconda-25ca7f9bc5ecec66b730dded8eb71897fb75ccc6.tar.gz anaconda-25ca7f9bc5ecec66b730dded8eb71897fb75ccc6.tar.xz anaconda-25ca7f9bc5ecec66b730dded8eb71897fb75ccc6.zip | |
2006-10-25 Jeremy Katz <katzj@redhat.com>
* isys/isys.py (driveDict): Fix potential case where we could have
a leaked file descripter (#212191)
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/isys.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/isys/isys.py b/isys/isys.py index f96d5cefe..7fa0ec4f7 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -290,10 +290,10 @@ def driveDict(klassArg): new[device] = dev continue - peddev = parted.PedDevice.get(devName) - model = peddev.model - if device.startswith("sd"): + peddev = parted.PedDevice.get(devName) + model = peddev.model + # blacklist *STMF on power5 iSeries boxes if rhpl.getArch() == "ppc" and \ model.find("IBM *STMF KERNEL") != -1: @@ -314,6 +314,8 @@ def driveDict(klassArg): (device,)) del peddev continue + + del peddev new[device] = dev except Exception, e: log.debug("exception checking disk blacklist on %s: %s" % \ |