[PATCH 7/7] Add mounts before swaps so the default selection is a mount.

David Lehman dlehman at redhat.com
Fri Aug 24 20:21:05 UTC 2012


---
 pyanaconda/ui/gui/spokes/custom.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index db8814a..7e5b59d 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -450,21 +450,21 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             page = Page()
             page.pageTitle = root.name
 
-            for device in root.swaps:
+            for (mountpoint, device) in root.mounts.iteritems():
                 if device not in self._devices:
                     continue
 
-                selector = page.addDevice("Swap",
-                                          Size(spec="%f MB" % device.size),
-                                          None, self.on_selector_clicked)
+                selector = page.addDevice(self._mountpointName(mountpoint) or device.format.name, Size(spec="%f MB" % device.size), mountpoint, self.on_selector_clicked)
                 selector._device = device
                 selector._root = root
 
-            for (mountpoint, device) in root.mounts.iteritems():
+            for device in root.swaps:
                 if device not in self._devices:
                     continue
 
-                selector = page.addDevice(self._mountpointName(mountpoint) or device.format.name, Size(spec="%f MB" % device.size), mountpoint, self.on_selector_clicked)
+                selector = page.addDevice("Swap",
+                                          Size(spec="%f MB" % device.size),
+                                          None, self.on_selector_clicked)
                 selector._device = device
                 selector._root = root
 
-- 
1.7.7.6



More information about the anaconda-patches mailing list