Merge pull request #198 from jwendell/include-src

Add the manifest "include-source-type" key for packages object
This commit is contained in:
Anders Ingemann 2015-03-04 14:22:27 +01:00
commit 3d86cc3d72
2 changed files with 8 additions and 3 deletions

View file

@ -121,6 +121,7 @@ properties:
items: items:
$ref: '#/definitions/absolute_path' $ref: '#/definitions/absolute_path'
minItems: 1 minItems: 1
include-source-type: {type: boolean}
additionalProperties: false additionalProperties: false
plugins: plugins:
type: object type: object

View file

@ -24,14 +24,18 @@ class AddDefaultSources(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
include_src = info.manifest.packages.get('include-source-type', False)
components = ' '.join(info.manifest.packages.get('components', ['main'])) components = ' '.join(info.manifest.packages.get('components', ['main']))
info.source_lists.add('main', 'deb {apt_mirror} {system.release} ' + components) info.source_lists.add('main', 'deb {apt_mirror} {system.release} ' + components)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + components) if include_src:
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + components)
if info.release_codename != 'sid': if info.release_codename != 'sid':
info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates ' + components) info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates ' + components)
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates ' + components) if include_src:
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates ' + components)
info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + components) info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + components)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + components) if include_src:
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + components)
class AddBackports(Task): class AddBackports(Task):