From 017986eb02acea713e633a486dfeb308679035f6 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sat, 19 Dec 2015 15:05:53 +0000 Subject: Ensure no-kernel works. Closes: #808358 Add package inclusion functions to the fast tests and dry-run output. --- vmdebootstrap/codenames.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vmdebootstrap') diff --git a/vmdebootstrap/codenames.py b/vmdebootstrap/codenames.py index d0f71fe..0bf46ac 100644 --- a/vmdebootstrap/codenames.py +++ b/vmdebootstrap/codenames.py @@ -62,9 +62,8 @@ class Codenames(Base): def kernel_package(self): packages = [] - if not self.settings['no-kernel']: - if self.settings['kernel-package']: - return packages + if self.settings['no-kernel'] or self.settings['kernel-package']: + return packages if self.settings['arch'] == 'i386': # wheezy (which became oldstable on 04/25/2015) used '486' if self.was_oldstable(datetime.date(2015, 4, 26)): -- cgit v1.2.1