[anaconda:master 1/4] Update devicetree.findActions invocations to match blivet interface change

mulhern amulhern at redhat.com
Thu May 1 13:11:26 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 pyanaconda/install.py              | 4 ++--
 pyanaconda/ui/gui/spokes/custom.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index bc80729..024aa3c 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -131,8 +131,8 @@ def doInstall(storage, payload, ksdata, instClass):
 
     # We really only care about actions that affect filesystems, since
     # those are the ones that take the most time.
-    steps = len(storage.devicetree.findActions(type="create", object="format")) + \
-            len(storage.devicetree.findActions(type="resize", object="format"))
+    steps = len(storage.devicetree.findActions(action_type="create", action_object="format")) + \
+            len(storage.devicetree.findActions(action_type="resize", action_object="format"))
 
     # pre setup phase, post install
     steps += 2
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 83a2d1c..6aee6b0 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -712,7 +712,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         _changed_size = False
         if size != device.size and size == device.currentSize:
             # size has been set back to its original value
-            actions = self._storage_playground.devicetree.findActions(type="resize",
+            actions = self._storage_playground.devicetree.findActions(action_type="resize",
                                                             devid=device.id)
             for action in reversed(actions):
                 self._storage_playground.devicetree.cancelAction(action)
-- 
1.8.3.1



More information about the anaconda-patches mailing list