From b95e71c4c8199d8e96e6698dbf6909dd69dafc75 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 13 Dec 2015 00:16:31 +0100
Subject: [PATCH] Move dpkg specific settings to dpkg subsection

---
 bootstrapvz/plugins/minimize_size/__init__.py         | 6 ++++--
 bootstrapvz/plugins/minimize_size/manifest-schema.yml | 3 +++
 bootstrapvz/plugins/minimize_size/tasks/dpkg.py       | 4 ++--
 manifests/examples/docker/jessie.yml                  | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bootstrapvz/plugins/minimize_size/__init__.py b/bootstrapvz/plugins/minimize_size/__init__.py
index 913e734..12ec14b 100644
--- a/bootstrapvz/plugins/minimize_size/__init__.py
+++ b/bootstrapvz/plugins/minimize_size/__init__.py
@@ -37,10 +37,12 @@ def resolve_tasks(taskset, manifest):
 		                tasks.dpkg.CreateBootstrapFilterScripts,
 		                tasks.dpkg.DeleteBootstrapFilterScripts,
 		                ]
-		if 'locales' in apt:
+	if 'dpkg' in manifest.plugins['minimize_size']:
+		dpkg = manifest.plugins['minimize_size']['dpkg']
+		if 'locales' in dpkg:
 			taskset.update(filter_tasks)
 			taskset.add(tasks.dpkg.FilterLocales)
-		if apt.get('exclude_docs', False):
+		if dpkg.get('exclude_docs', False):
 			taskset.update(filter_tasks)
 			taskset.add(tasks.dpkg.ExcludeDocs)
 
diff --git a/bootstrapvz/plugins/minimize_size/manifest-schema.yml b/bootstrapvz/plugins/minimize_size/manifest-schema.yml
index 9483a92..5bcac9f 100644
--- a/bootstrapvz/plugins/minimize_size/manifest-schema.yml
+++ b/bootstrapvz/plugins/minimize_size/manifest-schema.yml
@@ -23,6 +23,9 @@ properties:
                 type: boolean
               autoremove_suggests:
                 type: boolean
+          dpkg:
+            type: object
+            properties:
               locales:
                 type: array
                 minItems: 1
diff --git a/bootstrapvz/plugins/minimize_size/tasks/dpkg.py b/bootstrapvz/plugins/minimize_size/tasks/dpkg.py
index 9e6e148..b927c3e 100644
--- a/bootstrapvz/plugins/minimize_size/tasks/dpkg.py
+++ b/bootstrapvz/plugins/minimize_size/tasks/dpkg.py
@@ -81,7 +81,7 @@ class FilterLocales(Task):
 			'/usr/share/man/',
 		])
 
-		locales = info.manifest.plugins['minimize_size']['apt']['locales']
+		locales = info.manifest.plugins['minimize_size']['dpkg']['locales']
 		info._minimize_size['bootstrap_filter']['include'].extend([
 			'/usr/share/locale/locale.alias',
 			'/usr/share/man/man1',
@@ -104,7 +104,7 @@ class FilterLocales(Task):
 		manpages_lines = ['path-exclude=/usr/share/man/*',
 		                  'path-include=/usr/share/man/man[1-9]']
 
-		locales = info.manifest.plugins['minimize_size']['apt']['locales']
+		locales = info.manifest.plugins['minimize_size']['dpkg']['locales']
 		locale_lines.extend(map(lambda l: 'path-include=/usr/share/locale/' + l + '/*', locales))
 		manpages_lines.extend(map(lambda l: 'path-include=/usr/share/man/' + l + '/*', locales))
 
diff --git a/manifests/examples/docker/jessie.yml b/manifests/examples/docker/jessie.yml
index 13e94bc..a28089d 100644
--- a/manifests/examples/docker/jessie.yml
+++ b/manifests/examples/docker/jessie.yml
@@ -31,6 +31,7 @@ plugins:
       languages: [none]
       gzip_indexes: true
       autoremove_suggests: true
+    dpkg:
       locales:
         - en
         - en_US