diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-23 11:22:44 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-23 11:22:44 -0700 |
| commit | 1afc0995bc77fbbb7f724e5086762f64ddc53c31 (patch) | |
| tree | a6c0847d01945cfba761b0991480212d07c2a06f /nova/process.py | |
| parent | e74b8070f73d8bada01cfe2d26223e5180ab67fb (diff) | |
| parent | e6c1c9dcef9f57930783a64ecb0595ba8e714c4c (diff) | |
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 |