summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-09-26 16:49:09 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-26 16:49:09 +0000
commit0a76d88bcd02fcfe4678310e7d8a6ffdbabfd48e (patch)
tree0a4a17dbfa94105a966aded4f81892298afbb8d7
parentd198db7f42da2915f506e7d679d47823eda58b2a (diff)
parent88f508f28e8f63b4fc8d57c50158269507fd5957 (diff)
Merge "Properly handle quotes in argument masking" into stable/colorado
-rw-r--r--deploy/common.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/deploy/common.py b/deploy/common.py
index 353045867..80832e201 100644
--- a/deploy/common.py
+++ b/deploy/common.py
@@ -18,6 +18,7 @@ import shutil
import stat
import errno
import time
+import shlex
N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5,
'roles': 6, 'pending_roles': 7, 'online': 8, 'group_id': 9}
@@ -41,7 +42,7 @@ os.chmod(LOGFILE, 0664)
def mask_arguments(cmd, mask_args, mask_str):
- cmd_line = cmd.split()
+ cmd_line = shlex.split(cmd)
for pos in mask_args:
# Don't mask the actual command; also check if we don't reference
# beyond bounds