From d90bfd6268e8c73f575384d837ea2935f04221ba Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 9 Dec 2014 10:47:05 -0500
Subject: tools/ccfg-merge-debug: fix for updated user-data/vendor-data

this was broken previously when user-data and vender-data were
brought together.
---
 tools/ccfg-merge-debug | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.1