uncommitted changes in tree (msw)

2 files changed, 10 insertions, 1 deletions

diff --git a/fstab.py b/fstab.py
index 1293e6f42..8630d404e 100644
--- a/fstab.py
+++ b/fstab.py
@@ -254,6 +254,9 @@ class Fstab:
 	self.supplementalRaid.append((mountPoint, raidDevice, fileSystem,
 				  raidLevel, deviceList))
 
+    def clearExistingRaid(self):
+	self.existingRaid = []
+
     def addExistingRaidDevice(self, raidDevice, mntPoint, fsystem, deviceList):
         self.existingRaid.append(raidDevice, mntPoint, fsystem, deviceList)
 
@@ -506,6 +509,9 @@ class Fstab:
 
 	self.createRaidTab(prefix + "/etc/raidtab", "/dev")
 
+    def clearMounts(self):
+	self.extraFilesystems = []
+
     def addMount(self, partition, mount, fsystem, doFormat = 0, size = 0):
 	self.extraFilesystems.append(mount, partition, fsystem, doFormat,
 				     size)
@@ -666,6 +672,9 @@ def readFstab (path, fstab):
     lines = f.readlines ()
     f.close
 
+    fstab.clearExistingRaid()
+    fstab.clearMounts()
+
     drives = fstab.driveList()
     raidList = raid.scanForRaid(drives)
     raidByDev = {}
diff --git a/iw/bootdisk.py b/iw/bootdisk.py
index 1bb958a32..3d04aa171 100644
--- a/iw/bootdisk.py
+++ b/iw/bootdisk.py
@@ -24,7 +24,7 @@ class BootdiskWindow (InstallWindow):
         threads_leave ()
         try:
             self.todo.makeBootdisk ()
-        except:
+        except RuntimeError, message:
             threads_enter ()
             BootdiskWindow.initial = 0
             return BootdiskWindow