diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
| commit | d42e168763d232476407a07b79056fb745c6075e (patch) | |
| tree | 25e98655b2fcf9a05ecc832ee17e0c1d9e7f2221 /nova/process.py | |
| parent | 28336ed41e0d44d7600588a6014f6253e4b87a42 (diff) | |
| parent | 4e727faf450154d89687b1a33dae2159d5b691a0 (diff) | |
| download | nova-d42e168763d232476407a07b79056fb745c6075e.tar.gz nova-d42e168763d232476407a07b79056fb745c6075e.tar.xz nova-d42e168763d232476407a07b79056fb745c6075e.zip | |
Merge trunk
Diffstat (limited to 'nova/process.py')
| -rw-r--r-- | nova/process.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/process.py b/nova/process.py index bda8147d5..13cb90e82 100644 --- a/nova/process.py +++ b/nova/process.py @@ -30,7 +30,7 @@ from twisted.internet import protocol from twisted.internet import reactor from nova import flags -from nova.utils import ProcessExecutionError +from nova.exception import ProcessExecutionError FLAGS = flags.FLAGS flags.DEFINE_integer('process_pool_size', 4, @@ -127,7 +127,7 @@ def get_process_output(executable, args=None, env=None, path=None, deferred = defer.Deferred() cmd = executable if args: - cmd = cmd + " " + ' '.join(args) + cmd = " ".join([cmd] + args) logging.debug("Running cmd: %s", cmd) process_handler = BackRelayWithInput( deferred, @@ -141,8 +141,8 @@ def get_process_output(executable, args=None, env=None, path=None, executable = str(executable) if not args is None: args = [str(x) for x in args] - process_reactor.spawnProcess( process_handler, executable, - (executable,)+tuple(args), env, path) + process_reactor.spawnProcess(process_handler, executable, + (executable,)+tuple(args), env, path) return deferred |