summaryrefslogtreecommitdiff
path: root/vmdebootstrap
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2015-12-19 15:05:53 +0000
committerNeil Williams <codehelp@debian.org>2015-12-19 15:05:53 +0000
commit017986eb02acea713e633a486dfeb308679035f6 (patch)
tree4a1e356432e561f35cea260b2ac7a16db1e8e152 /vmdebootstrap
parent95048ea4631d15756de8edaadbef728820d921c0 (diff)
downloadvmdebootstrap-017986eb02acea713e633a486dfeb308679035f6.tar.gz
Ensure no-kernel works.
Closes: #808358 Add package inclusion functions to the fast tests and dry-run output.
Diffstat (limited to 'vmdebootstrap')
-rw-r--r--vmdebootstrap/codenames.py5
1 files changed, 2 insertions, 3 deletions
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)):