forked from pool/cloud-init
23 lines
825 B
Diff
23 lines
825 B
Diff
|
--- cloudinit/config/cc_rightscale_userdata.py.orig
|
||
|
|
+++ cloudinit/config/cc_rightscale_userdata.py
|
||
|
|
@@ -58,7 +58,7 @@ def handle(name, _cfg, cloud, log, _args
|
||
|
|
|
||
|
|
try:
|
||
|
|
mdict = parse_qs(ud)
|
||
|
|
- if mdict or MY_HOOKNAME not in mdict:
|
||
|
|
+ if not mdict or MY_HOOKNAME not in mdict:
|
||
|
|
log.debug(("Skipping module %s, "
|
||
|
|
"did not find %s in parsed"
|
||
|
|
" raw userdata"), name, MY_HOOKNAME)
|
||
|
|
--- cloudinit/util.py.orig
|
||
|
|
+++ cloudinit/util.py
|
||
|
|
@@ -1146,7 +1146,7 @@ def chownbyname(fname, user=None, group=
|
||
|
|
# this returns the specific 'mode' entry, cleanly formatted, with value
|
||
|
|
def get_output_cfg(cfg, mode):
|
||
|
|
ret = [None, None]
|
||
|
|
- if cfg or 'output' not in cfg:
|
||
|
|
+ if not cfg or 'output' not in cfg:
|
||
|
|
return ret
|
||
|
|
|
||
|
|
outcfg = cfg['output']
|