tools/ccfg-merge-debug: fix for updated user-data/vendor-data

this was broken previously when user-data and vender-data were brought together.
openstack · d90bfd6268e8c73f575384d837ea2935f04221ba · smoser committed Dec 9, 2014 · Dec 9, 2014 · d90bfd6
1 parent b1462e1
commit d90bfd6268e8c73f575384d837ea2935f04221ba
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 tools/ccfg-merge-debug
diff --git 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)