1 files changed, 15 insertions, 33 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 1edf4609b..ca0502b75 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -1,18 +1,14 @@
 """Action driver"""
 
-import os
-import sys
-import select
 import Bcfg2.Client.Tools
-from Bcfg2.Compat import input  # pylint: disable=W0622
+from Bcfg2.Utils import safe_input
 
 
 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 RunAction(self, entry):
         """This method handles command execution and status return."""
@@ -22,19 +18,15 @@ class Action(Bcfg2.Client.Tools.Tool):
             shell = True
             shell_string = '(in shell) '
 
-        if not self.setup['dryrun']:
-            if self.setup['interactive']:
+        if not Bcfg2.Options.setup.dry_run:
+            if Bcfg2.Options.setup.interactive:
                 prompt = ('Run Action %s%s, %s: (y/N): ' %
                           (shell_string, entry.get('name'),
                            entry.get('command')))
-                # flush input buffer
-                while len(select.select([sys.stdin.fileno()], [], [],
-                                        0.0)[0]) > 0:
-                    os.read(sys.stdin.fileno(), 4096)
-                ans = input(prompt)
+                ans = safe_input(prompt)
                 if ans not in ['y', 'Y']:
                     return False
-            if self.setup['servicemode'] == 'build':
+            if Bcfg2.Options.setup.service_mode == 'build':
                 if entry.get('build', 'true') == 'false':
                     self.logger.debug("Action: Deferring execution of %s due "
                                       "to build mode" % entry.get('command'))
@@ -55,39 +47,29 @@ 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):
+    def BundleUpdated(self, bundle):
         """Run postinstalls when bundles have been updated."""
-        for postinst in bundle.findall("PostInstall"):
-            if not self._install_allowed(postinst):
-                continue
-            self.cmd.run(postinst.get('name'))
+        states = dict()
         for action in bundle.findall("Action"):
             if action.get('timing') in ['post', 'both']:
                 if not self._install_allowed(action):
                     continue
                 states[action] = self.RunAction(action)
+        return states
 
-    def BundleNotUpdated(self, bundle, states):
+    def BundleNotUpdated(self, bundle):
         """Run Actions when bundles have not been updated."""
+        states = dict()
         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._install_allowed(action):
                     continue
                 states[action] = self.RunAction(action)
+        return states