kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-07 17:40:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move dpkg specific settings to dpkg subsection

Browse source
This commit is contained in:
Anders Ingemann 2015-12-13 00:16:31 +01:00
parent 50b02777e5
commit b95e71c4c8
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrapvz/plugins/minimize_size/__init__.py
View file

@ -37,10 +37,12 @@ def resolve_tasks(taskset, manifest):
tasks.dpkg.CreateBootstrapFilterScripts, tasks.dpkg.CreateBootstrapFilterScripts,
tasks.dpkg.DeleteBootstrapFilterScripts, 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.update(filter_tasks)
taskset.add(tasks.dpkg.FilterLocales) taskset.add(tasks.dpkg.FilterLocales)
if apt.get('exclude_docs', False): if dpkg.get('exclude_docs', False):
taskset.update(filter_tasks) taskset.update(filter_tasks)
taskset.add(tasks.dpkg.ExcludeDocs) taskset.add(tasks.dpkg.ExcludeDocs)

3
bootstrapvz/plugins/minimize_size/manifest-schema.yml
View file

@ -23,6 +23,9 @@ properties:
type: boolean type: boolean
autoremove_suggests: autoremove_suggests:
type: boolean type: boolean
dpkg:
type: object
properties:
locales: locales:
type: array type: array
minItems: 1 minItems: 1

4
bootstrapvz/plugins/minimize_size/tasks/dpkg.py
View file

@ -81,7 +81,7 @@ class FilterLocales(Task):
'/usr/share/man/', '/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([ info._minimize_size['bootstrap_filter']['include'].extend([
'/usr/share/locale/locale.alias', '/usr/share/locale/locale.alias',
'/usr/share/man/man1', '/usr/share/man/man1',
@ -104,7 +104,7 @@ class FilterLocales(Task):
manpages_lines = ['path-exclude=/usr/share/man/*', manpages_lines = ['path-exclude=/usr/share/man/*',
'path-include=/usr/share/man/man[1-9]'] '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)) 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)) manpages_lines.extend(map(lambda l: 'path-include=/usr/share/man/' + l + '/*', locales))

1
manifests/examples/docker/jessie.yml
View file

@ -31,6 +31,7 @@ plugins:
languages: [none] languages: [none]
gzip_indexes: true gzip_indexes: true
autoremove_suggests: true autoremove_suggests: true
dpkg:
locales: locales:
- en - en
- en_US - en_US