Added hooke.plugin.playlist.ApplyCommandStack and related changes.

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index d9def059acc40035eaece866362e2e970049753a..c475d3acb756d42bdff14328f84990f20659fa02 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -71,6 +71,7 @@ from . import playlist
 from . import plugin as plugin_mod
 from . import driver as driver_mod
 from . import ui
+from .compat import forking as forking  # dynamically patch multiprocessing.forking
 
 
 class Hooke (object):
@@ -122,7 +123,7 @@ class Hooke (object):
             self.config.write()  # Does not preserve original comments
 
     def run_command(self, command, arguments):
-        """Run `command` with `arguments` using
+        """Run the command named `command` with `arguments` using
         :meth:`~hooke.engine.CommandEngine.run_command`.
 
         Allows for running commands without spawning another process
@@ -168,6 +169,7 @@ class HookeRunner (object):
         command = multiprocessing.Process(name='command engine',
             target=hooke.engine.run, args=(hooke, ui_to_command, command_to_ui))
         command.start()
+        hooke.engine = None  # no more need for the UI-side version.
         return (ui_to_command, command_to_ui, command)
 
     def _cleanup_run(self, ui_to_command, command_to_ui, command):
@@ -196,8 +198,7 @@ def main():
         action='append', default=[],
         help='Add a command line Hooke command to run.')
     p.add_option(
-        '--command-no-exit', dest='command_exit',
-        action='store_false', default=True,
+        '-p', '--persist', dest='persist', action='store_true', default=False,
         help="Don't exit after running a script or commands.")
     p.add_option(
         '--save-config', dest='save_config',
@@ -230,7 +231,7 @@ def main():
         try:
             hooke = runner.run_lines(hooke, options.commands)
         finally:
-            if options.command_exit == True:
+            if options.persist == False:
                 hooke.close(save_config=options.save_config)
                 sys.exit(0)