diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-12-09 10:47:05 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-12-09 10:47:05 -0500 |
commit | d90bfd6268e8c73f575384d837ea2935f04221ba (patch) | |
tree | ad199a7ba6f336019546d6abc5742faf4b3fd6b5 | |
parent | b1462e19436923b87e05abf5cc3223c37fce8892 (diff) | |
download | cloud-init-d90bfd6268e8c73f575384d837ea2935f04221ba.tar.gz |
tools/ccfg-merge-debug: fix for updated user-data/vendor-data
this was broken previously when user-data and vender-data were
brought together.
-rwxr-xr-x | tools/ccfg-merge-debug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/ccfg-merge-debug b/tools/ccfg-merge-debug index 5b6b050a..85227da7 100755 --- a/tools/ccfg-merge-debug +++ b/tools/ccfg-merge-debug @@ -48,7 +48,7 @@ def main(): ccph.cloud_fn = outfile c_handlers = helpers.ContentHandlers() - c_handlers.register_defaults([ccph]) + c_handlers.register(ccph) called = [] for (_ctype, mod) in c_handlers.iteritems(): @@ -69,6 +69,7 @@ def main(): # to help write there contents to files with numbered # names... 'handlercount': 0, + 'excluded': [], } handlers.walk(user_data_msg, handlers.walker_callback, data=part_data) |