refactor(dump): use get_config to get a config without includes

As config.get_config() is able to remove the includes key, we just
use this instead of manually removing it in the dump plugin.

No functional change.

Signed-off-by: Felix Moessbauer <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>

Author: fmoessbauer

kas/plugins/dump.py

@@ -224,7 +224,7 @@ def _filter_local(repos):
         ctx = get_context()
         schema_v = 14 if args.lock else 7
         config_expanded = {'header': {'version': schema_v}} if args.lock \
-            else ctx.config.get_config()
+            else ctx.config.get_config(remove_includes=True)
         repos = ctx.config.repo_dict.items()
         output = IoTarget(target=sys.stdout, managed=False)
 
@@ -246,10 +246,6 @@ def _filter_local(repos):
             config_expanded['overrides'] = \
                 {'repos': {k: {'commit': r.revision} for k, r in repos}}
 
-        # includes are already expanded, delete the key
-        if 'includes' in config_expanded['header']:
-            del config_expanded['header']['includes']
-
         if args.resolve_refs and not args.lock:
             for k, r in _filter_enabled(repos):
                 if r.commit or r.branch or r.tag: