summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-01-26 17:09:52 -0500
committerScott Moser <smoser@ubuntu.com>2011-01-26 17:09:52 -0500
commite07de49c95955b194f12a997db10689f4c421106 (patch)
tree1b92a88cae121c94a6a4dc75226adc7958678873 /cloudinit
parente06ff3e6d0ead26577915bc80433a1aa2d2f24ed (diff)
downloadvyos-cloud-init-e07de49c95955b194f12a997db10689f4c421106.tar.gz
vyos-cloud-init-e07de49c95955b194f12a997db10689f4c421106.zip
if output entry is a scalar, send stdout and stderr same place
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/CloudConfig/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/__init__.py b/cloudinit/CloudConfig/__init__.py
index fe2dddcf..7b01f00a 100644
--- a/cloudinit/CloudConfig/__init__.py
+++ b/cloudinit/CloudConfig/__init__.py
@@ -136,9 +136,9 @@ def get_output_cfg(cfg, mode="init"):
# then it applies to all users of this (init, config, final)
modecfg = outcfg['all']
- # if value is a string, it specifies stdout
+ # if value is a string, it specifies stdout and stderr
if isinstance(modecfg,str):
- ret = [ modecfg, None ]
+ ret = [ modecfg, modecfg ]
# if its a list, then we expect (stdout, stderr)
if isinstance(modecfg,list):