Don't traceback on blank lines in modprobe.conf (#241991).

3 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 063f1c0a9..ba9e25156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
 
 2007-06-01  Chris Lumens  <clumens@redhat.com>
 
+	* iw/upgrade_bootloader_gui.py (UpgradeBootloaderWindow._newToLibata):
+	Don't traceback on blank lines in modprobe.conf (#241991).
+	* textw/upgrade_bootloader_text.py (UpgradeBootloaderWindow._ideToLibata):
+	Likewise.
+
 	* iw/release_notes.py (ReleaseNotesViewer.getReleaseNotes):  Fall back
 	to English release notes if translated ones aren't found (#241975).
 
diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py
index 25a3a9faa..d74acbb2c 100644
--- a/iw/upgrade_bootloader_gui.py
+++ b/iw/upgrade_bootloader_gui.py
@@ -64,7 +64,7 @@ class UpgradeBootloaderWindow (InstallWindow):
         except:
             log.debug("error reading /proc/modules")
             pass
-        
+
         try:
             f = open(rootPath + "/etc/modprobe.conf")
         except:
@@ -75,10 +75,12 @@ class UpgradeBootloaderWindow (InstallWindow):
         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
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,