[linux] 01/06: gencontrol.py: rename docs section to packages
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Fri Nov 13 16:48:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 91d01a70ac1dd2008ae84cefc5a95ca12067b125
Author: Yves-Alexis Perez <corsac at debian.org>
Date: Thu Nov 12 21:17:54 2015 +0100
gencontrol.py: rename docs section to packages
prelude to adding more options to disable some packages
---
debian/bin/gencontrol.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index fba2133..d7fea7a 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -42,8 +42,8 @@ class Gencontrol(Base):
'flavours': config.SchemaItemList(),
'versions': config.SchemaItemList(),
},
- 'docs': {
- 'enabled': config.SchemaItemBoolean(),
+ 'packages': {
+ 'docs': config.SchemaItemBoolean(),
}
}
@@ -109,7 +109,7 @@ class Gencontrol(Base):
makeflags = makeflags.copy()
makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
- if not self.config.merge('docs').get('enabled', True):
+ if not self.config.merge('packages').get('docs', True):
makeflags['DO_DOCS'] = False
super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
@@ -118,7 +118,7 @@ class Gencontrol(Base):
def do_main_packages(self, packages, vars, makeflags, extra):
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
- if self.config.merge('docs').get('enabled', True):
+ if self.config.merge('packages').get('docs', True):
packages.extend(self.process_packages(self.templates["control.docs"], self.vars))
arch_makeflags = (
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list