diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-20 19:17:36 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-20 19:17:36 -0700 |
| commit | 026f6f2b7f5457f15a258ebed66bb8dda3263eec (patch) | |
| tree | 146dcfe5e69bd4c7bea76e46fa97fbeb39828581 /nova/process.py | |
| parent | c791229d11e3baf2a5828ee8efe98ed827a35dde (diff) | |
| parent | d8861d04a85044ae57ffd7eb9ab682879beecf7d (diff) | |
| download | nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.tar.gz nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.tar.xz nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.zip | |
merged 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 |