From 17840b98fa4ff2b231fbc2877ca6aed40200300e 2012-08-09 07:36:54 From: Fernando Perez Date: 2012-08-09 07:36:54 Subject: [PATCH] Merge pull request #2270 from minrk/sshlaunchers SSHLauncher tweaks * use pipes.quote on SSH commands * default SSHEngineSetLauncher to `ipengine` instead of import-based command. This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command. --- diff --git a/IPython/parallel/apps/launcher.py b/IPython/parallel/apps/launcher.py index 71fc824..453f6e9 100644 --- a/IPython/parallel/apps/launcher.py +++ b/IPython/parallel/apps/launcher.py @@ -584,7 +584,7 @@ class SSHLauncher(LocalProcessLauncher): def find_args(self): return self.ssh_cmd + self.ssh_args + [self.location] + \ - self.program + self.program_args + list(map(pipes.quote, self.program + self.program_args)) def _send_file(self, local, remote): """send a single file""" @@ -726,6 +726,9 @@ class SSHEngineSetLauncher(LocalEngineSetLauncher): help="""dict of engines to launch. This is a dict by hostname of ints, corresponding to the number of engines to start on that host.""") + def _engine_cmd_default(self): + return ['ipengine'] + @property def engine_count(self): """determine engine count from `engines` dict"""