debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

gencontrol.py: Delete redundant arguments to ConfigCore.merge

This commit is contained in:
Ben Hutchings 2015-11-12 15:12:02 +00:00
parent b11f7640b8
commit 91416e456c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/bin/gencontrol.py vendored
View File

@ -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', None, None).get('enabled', True):
if not self.config.merge('docs').get('enabled', 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', None, None).get('enabled', True):
if self.config.merge('docs').get('enabled', True):
packages.extend(self.process_packages(self.templates["control.docs"], self.vars))
arch_makeflags = (