1 files changed, 8 insertions, 26 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index b1a897c81..7e8366928 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -11,9 +11,8 @@ from Bcfg2.Compat import input  # pylint: disable=W0622
 class Action(Bcfg2.Client.Tools.Tool):
     """Implement Actions"""
     name = 'Action'
-    __handles__ = [('PostInstall', None), ('Action', None)]
-    __req__ = {'PostInstall': ['name'],
-               'Action': ['name', 'timing', 'when', 'command', 'status']}
+    __handles__ = [('Action', None)]
+    __req__ = {'Action': ['name', 'timing', 'when', 'command', 'status']}
 
     def _action_allowed(self, action):
         """ Return true if the given action is allowed to be run by
@@ -49,14 +48,11 @@ class Action(Bcfg2.Client.Tools.Tool):
                                       "to build mode" % entry.get('command'))
                     return False
             self.logger.debug("Running Action %s" % (entry.get('name')))
-            rv = self.cmd.run(entry.get('command'))[0]
+            rv = self.cmd.run(entry.get('command'))
             self.logger.debug("Action: %s got return code %s" %
-                              (entry.get('command'), rv))
-            entry.set('rc', str(rv))
-            if entry.get('status', 'check') == 'ignore':
-                return True
-            else:
-                return rv == 0
+                              (entry.get('command'), rv.retval))
+            entry.set('rc', str(rv.retval))
+            return entry.get('status', 'check') == 'ignore' or rv.success
         else:
             self.logger.debug("In dryrun mode: not running action: %s" %
                               (entry.get('name')))
@@ -66,28 +62,14 @@ class Action(Bcfg2.Client.Tools.Tool):
         """Actions always verify true."""
         return True
 
-    def VerifyPostInstall(self, dummy, _):
-        """Actions always verify true."""
-        return True
-
     def InstallAction(self, entry):
         """Run actions as pre-checks for bundle installation."""
         if entry.get('timing') != 'post':
             return self.RunAction(entry)
         return True
 
-    def InstallPostInstall(self, entry):
-        """ Install a deprecated PostInstall entry """
-        self.logger.warning("Installing deprecated PostInstall entry %s" %
-                            entry.get("name"))
-        return self.InstallAction(entry)
-
     def BundleUpdated(self, bundle, states):
         """Run postinstalls when bundles have been updated."""
-        for postinst in bundle.findall("PostInstall"):
-            if not self._action_allowed(postinst):
-                continue
-            self.cmd.run(postinst.get('name'))
         for action in bundle.findall("Action"):
             if action.get('timing') in ['post', 'both']:
                 if not self._action_allowed(action):
@@ -97,8 +79,8 @@ class Action(Bcfg2.Client.Tools.Tool):
     def BundleNotUpdated(self, bundle, states):
         """Run Actions when bundles have not been updated."""
         for action in bundle.findall("Action"):
-            if action.get('timing') in ['post', 'both'] and \
-               action.get('when') != 'modified':
+            if (action.get('timing') in ['post', 'both'] and
+                action.get('when') != 'modified'):
                 if not self._action_allowed(action):
                     continue
                 states[action] = self.RunAction(action)