summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2012-08-20 15:39:39 -0600
committerBen Howard <ben.howard@canonical.com>2012-08-20 15:39:39 -0600
commit8aa59086146062fc767349be086fe0c35bf9c477 (patch)
tree7288ebad86ec5f16c2db17f2903df2d9a771769f /cloudinit/util.py
parent336ddbe13bdfc729495f5bfb8cc89b4360916157 (diff)
downloadvyos-cloud-init-8aa59086146062fc767349be086fe0c35bf9c477.tar.gz
vyos-cloud-init-8aa59086146062fc767349be086fe0c35bf9c477.zip
Dropped hidden command; replaced with logstring. Also changed useradd command to use log options over short
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 0fbf9832..a7d72d59 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1329,17 +1329,17 @@ def delete_dir_contents(dirname):
del_file(node_fullpath)
-def subp(args, data=None, rcs=None, env=None, capture=True, shell=False, hidden=False):
+def subp(args, data=None, rcs=None, env=None, capture=True, shell=False, logstring=False):
if rcs is None:
rcs = [0]
try:
- if not hidden:
+ if not logstring:
LOG.debug(("Running command %s with allowed return codes %s"
" (shell=%s, capture=%s)"), args, rcs, shell, capture)
else:
- LOG.debug(("Running hidden command to protect sensative output "
- " Calling function: %s" ), hidden)
+ LOG.debug(("Running hidden command to protect sensitive input/output "
+ " logstring: %s" ), logstring)
if not capture:
stdout = None