[PATCH 12/21] Move setup of new partition weight arg to Storage.newPartition.

David Lehman dlehman at redhat.com
Thu Aug 9 19:28:31 UTC 2012


---
 pyanaconda/kickstart.py        |    7 -------
 pyanaconda/storage/__init__.py |    9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7e2022a..02e62c3 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1031,13 +1031,6 @@ class PartitionData(commands.partition.F17_PartData):
             except KeyError:
                 pass
 
-            if "format" in kwargs:
-                # set weight based on fstype and mountpoint
-                mpt = getattr(kwargs["format"], "mountpoint", None)
-                fstype = kwargs["format"].type
-                kwargs["weight"] = storage.platform.weight(fstype=fstype,
-                                                           mountpoint=mpt)
-
             request = storage.newPartition(**kwargs)
             storage.createDevice(request)
 
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index b7a1533..8e57a44 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -1092,6 +1092,15 @@ class Storage(object):
         else:
             name = "req%d" % self.nextID
 
+        if "weight" not in kwargs:
+            fmt = kwargs.get("format")
+            if fmt:
+                mountpoint = getattr(fmt, "mountpoint", None)
+
+                kwargs["weight"] = self.platform.weight(mountpoint=mountpoint,
+                                                        fstype=fmt.type)
+
+
         return PartitionDevice(name, *args, **kwargs)
 
     def newMDArray(self, *args, **kwargs):
-- 
1.7.7.6



More information about the anaconda-patches mailing list