diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-20 15:36:45 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-20 15:36:45 -0400 |
| commit | 8fb32a956490f9de623fad12d9b2b1f08f88511a (patch) | |
| tree | b5db72db732eb8cc390cbb4ec545df9e7cffa79a /nova/process.py | |
| parent | 8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8 (diff) | |
| parent | cda407fa0eff533e3aae7d3bf7276e0013a8a13d (diff) | |
Merge from 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 74725c157..b3cad894b 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 |