From 6d1ed573f309574ed2389de86bf6d2cf8575da17 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 4 Sep 2013 12:16:12 -0500 Subject: [PATCH] Let execute() accept a string for args. --- teuthology/orchestra/run.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py index a3edc0ea55..7bc5047668 100644 --- a/teuthology/orchestra/run.py +++ b/teuthology/orchestra/run.py @@ -41,6 +41,7 @@ def quote(args): yield pipes.quote(a) return ' '.join(_quote(args)) + def execute(client, args): """ Execute a command remotely. @@ -49,13 +50,16 @@ def execute(client, args): :param client: SSHConnection to run the command with :param args: command to run - :type args: list of string + :type args: string or list of strings Returns a RemoteProcess, where exitstatus is a callable that will block until the exit status is available. """ - cmd = quote(args) - (host,port) = client.get_transport().getpeername() + if isinstance(args, basestring): + cmd = args + else: + cmd = quote(args) + (host, port) = client.get_transport().getpeername() log.debug('Running [{h}]: {cmd!r}'.format(h=host, cmd=cmd)) (in_, out, err) = client.exec_command(cmd) -- 2.39.5