diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-06-01 15:32:16 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-06-01 15:32:16 +0000 |
| commit | 485c4a30405704f8209b26c626c65657c795787d (patch) | |
| tree | 5679069a776abdd07cf05704fb00b7d15a74a645 /textw/upgrade_bootloader_text.py | |
| parent | e1fab9fe4b7c21069e9b0f3d39bd66a51520c303 (diff) | |
| download | anaconda-485c4a30405704f8209b26c626c65657c795787d.tar.gz anaconda-485c4a30405704f8209b26c626c65657c795787d.tar.xz anaconda-485c4a30405704f8209b26c626c65657c795787d.zip | |
Don't traceback on blank lines in modprobe.conf (#241991).
Diffstat (limited to 'textw/upgrade_bootloader_text.py')
| -rw-r--r-- | textw/upgrade_bootloader_text.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py index abba18114..fc0901a9b 100644 --- a/textw/upgrade_bootloader_text.py +++ b/textw/upgrade_bootloader_text.py @@ -32,7 +32,7 @@ class UpgradeBootloaderWindow: except: log.debug("error reading /proc/modules") pass - + try: f = open(rootPath + "/etc/modprobe.conf") except: @@ -43,10 +43,12 @@ class UpgradeBootloaderWindow: f.close() for l in lines: - if l.strip()[0] == "#": + stripped = l.strip() + + if stripped == "" or stripped[0] == "#": continue - if l.find("scsi_hostadapter") != -1: + if stripped.find("scsi_hostadapter") != -1: return True return False @@ -71,7 +73,7 @@ class UpgradeBootloaderWindow: newbl = 1 else: update = 1 - + if newToLibata or self.type is None or self.bootDev is None: if newToLibata: t = TextboxReflowed(53, |