Default to no drives selected (#195636).

4 files changed, 21 insertions, 20 deletions

diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index 0ab49a0bb..2a65924f2 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -232,7 +232,7 @@ class PartitionTypeWindow(InstallWindow):
             createAllowedDrivesStore(self.diskset.disks,
                                      self.partitions.autoClearPartDrives,
                                      self.drivelist,
-                                     self.anaconda.updateSrc)
+                                     disallowDrives=[self.anaconda.updateSrc])
         
 
     def getScreen(self, anaconda):
@@ -272,7 +272,7 @@ class PartitionTypeWindow(InstallWindow):
 
         self.drivelist = createAllowedDrivesList(self.diskset.disks,
                                                  self.partitions.autoClearPartDrives,
-                                                 self.anaconda.updateSrc)
+                                                 disallowDrives=[self.anaconda.updateSrc])
         self.drivelist.set_size_request(375, 80)
 
         self.xml.get_widget("driveScroll").add(self.drivelist)
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index af856a9a1..30309d2b6 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -336,7 +336,8 @@ class PartitionEditor:
 
                 self.driveview = createAllowedDrivesList(self.diskset.disks,
                                                          self.origrequest.drive,
-                                                         self.anaconda.updateSrc)
+                                                         selectDrives=False,
+                                                         disallowDrives=[self.anaconda.updateSrc])
 		lbl.set_mnemonic_widget(self.driveview)
                 sw = gtk.ScrolledWindow()
                 sw.add(self.driveview)
diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
index 42541e903..a03c49f7d 100644
--- a/iw/partition_ui_helpers_gui.py
+++ b/iw/partition_ui_helpers_gui.py
@@ -120,35 +120,39 @@ def fstypechangeCB(widget, mountCombo):
     fstype = widget.get_active_value()
     setMntPtComboStateFromType(fstype, mountCombo)
 
-def createAllowedDrivesStore(disks, reqdrives, drivelist, updateSrc):
+def createAllowedDrivesStore(disks, reqdrives, drivelist, selectDrives=True,
+                             disallowDrives=[]):
     drivelist.clear()
     drives = disks.keys()
     drives.sort()
     for drive in drives:
         size = getDeviceSizeMB(disks[drive].dev)
-	selected = 0
-        if reqdrives:
-            if drive in reqdrives:
-		selected = 1
-        else:
-            if drive != updateSrc:
-                selected = 1
+	selected = False
+
+        if selectDrives:
+            if reqdrives:
+                if drive in reqdrives:
+                    selected = 1
+            else:
+                if drive not in disallowDrives:
+                    selected = 1
 
 	sizestr = "%8.0f MB" % size
-	drivelist.append_row((drive, sizestr, disks[drive].dev.model),selected)
+	drivelist.append_row((drive, sizestr, disks[drive].dev.model), selected)
 
     if len(disks.keys()) < 2:
 	drivelist.set_sensitive(False)
     else:
         drivelist.set_sensitive(True)
 
-def createAllowedDrivesList(disks, reqdrives, updateSrc):
+def createAllowedDrivesList(disks, reqdrives, selectDrives=True, disallowDrives=[]):
     store = gtk.TreeStore(gobject.TYPE_BOOLEAN,
 			  gobject.TYPE_STRING,
 			  gobject.TYPE_STRING,
 			  gobject.TYPE_STRING)
     drivelist = WideCheckList(3, store)
-    createAllowedDrivesStore(disks, reqdrives, drivelist, updateSrc)
+    createAllowedDrivesStore(disks, reqdrives, drivelist, selectDrives=selectDrives,
+                             disallowDrives=disallowDrives)
 
     return drivelist
     
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index c97fe9f15..b9b7f0ac1 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -48,13 +48,9 @@ class RaidEditor:
 	for part, size, used in allraidparts:
 	    partname = "%s" % part
 	    partsize = "%8.0f MB" % size
-	    if used or not reqraidpart:
-		selected = 1
-	    else:
-		selected = 0
 
-            if preexist == 0 or selected == 1:
-                partlist.append_row((partname, partsize), selected)
+            if preexist == 0:
+                partlist.append_row((partname, partsize), False)
 
 	return (partlist, sw)