mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-10-07 17:40:30 +00:00
Move dpkg specific settings to dpkg subsection
This commit is contained in:
parent
50b02777e5
commit
b95e71c4c8
4 changed files with 10 additions and 4 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -23,6 +23,9 @@ properties:
|
|||
type: boolean
|
||||
autoremove_suggests:
|
||||
type: boolean
|
||||
dpkg:
|
||||
type: object
|
||||
properties:
|
||||
locales:
|
||||
type: array
|
||||
minItems: 1
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ plugins:
|
|||
languages: [none]
|
||||
gzip_indexes: true
|
||||
autoremove_suggests: true
|
||||
dpkg:
|
||||
locales:
|
||||
- en
|
||||
- en_US
|
||||
|
|
Loading…
Add table
Reference in a new issue