Revert "Fixup 89e09478"

This reverts commit 4871d896.

Revert "Fixup 89e09478"
This reverts commit 4871d896.
6dd55384 · Łukasz Nowak · 4871d896 · 6dd55384
Commit 6dd55384 authored May 28, 2012 by Łukasz Nowak
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

master/product/Vifib/Tool/SlapTool.py master/product/Vifib/Tool/SlapTool.py +2 -6

No files found.
--- a/master/product/Vifib/Tool/SlapTool.py
+++ b/master/product/Vifib/Tool/SlapTool.py
@@ -838,14 +838,10 @@ class SlapTool(BaseTool):
    if requested_software_instance is None:
      raise SoftwareInstanceNotReady
    else:
-      requested_software_instance = portal.restrictedTraverse(
+      if not requested_software_instance.getAggregate(portal_type="Computer Partition"):
-        requested_software_instance)
-      if not requested_software_instance.getAggregate(
-        portal_type="Computer Partition"):
        raise SoftwareInstanceNotReady
      else:
-        parameter_dict = self._getSoftwareInstanceAsParameterDict(
+        parameter_dict = self._getSoftwareInstanceAsParameterDict(requested_software_instance)
-          requested_software_instance)
        software_instance = SoftwareInstance(**parameter_dict)
        return xml_marshaller.xml_marshaller.dumps(software_instance)