From 16b394d135d1c73c69d5201f95c1a3fa7aab9a21 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Thu, 8 May 2014 22:58:29 +0200 Subject: [PATCH] Fix fetching of packages.components Add update from master --- bootstrapvz/common/tasks/apt.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py index e708381..0d3faef 100644 --- a/bootstrapvz/common/tasks/apt.py +++ b/bootstrapvz/common/tasks/apt.py @@ -23,14 +23,12 @@ class AddDefaultSources(Task): @classmethod def run(cls, info): - components = 'main' - if 'components' in info.manifest.system: - components = ' '.join(info.manifest.system['components']) + 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-src {apt_mirror} {system.release} ' + 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 info.manifest.system['release'] not in {'testing', 'unstable'}: + 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-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-src {apt_mirror} {system.release}-updates ' + components)