From 72dfd72c360a2cdac4d82be86090d79198c57951 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 16 Dec 2012 15:35:51 +0000 Subject: [PATCH] Do not try to apply featureset patches when featureset is disabled svn path=/dists/trunk/linux/; revision=19609 --- debian/bin/gencontrol.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 0c25d3e73..dd2a50cf5 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -60,7 +60,10 @@ class Gencontrol(Base): }) def do_main_makefile(self, makefile, makeflags, extra): - for featureset in iter(self.config['base', ]['featuresets']): + fs_enabled = [featureset + for featureset in self.config['base', ]['featuresets'] + if self.config.merge('base', None, featureset).get('enabled', True)] + for featureset in fs_enabled: makeflags_featureset = makeflags.copy() makeflags_featureset['FEATURESET'] = featureset cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s" @@ -71,7 +74,7 @@ class Gencontrol(Base): makefile.add('source', ['source_%s' % featureset]) makeflags = makeflags.copy() - makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets']) + makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled) super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra) def do_main_packages(self, packages, vars, makeflags, extra):