diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
| commit | 92db1b884bf34339a4536a20123c45b01c9c49ce (patch) | |
| tree | 22be0de3d0496212d26015c3b30423da9338aa5c /tools/ccfg-merge-debug | |
| parent | 91ccf1b55b5b79694449446b029dd7c4570517a5 (diff) | |
| parent | 72f826bff694b612d54b177635ca7e0dc83aed2f (diff) | |
| download | vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.tar.gz vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.zip | |
merge with trunk
Diffstat (limited to 'tools/ccfg-merge-debug')
| -rwxr-xr-x | tools/ccfg-merge-debug | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/ccfg-merge-debug b/tools/ccfg-merge-debug index 5b6b050a..1f08e0cb 100755 --- a/tools/ccfg-merge-debug +++ b/tools/ccfg-merge-debug @@ -48,10 +48,10 @@ 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(): + for (_ctype, mod) in c_handlers.items(): if mod in called: continue handlers.call_begin(mod, data, frequency) @@ -69,13 +69,14 @@ 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) # Give callbacks opportunity to finalize called = [] - for (_ctype, mod) in c_handlers.iteritems(): + for (_ctype, mod) in c_handlers.items(): if mod in called: continue handlers.call_end(mod, data, frequency) |