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

debian/bin: Some PEP8 fixes. 

svn path=/dists/trunk/linux/; revision=20738
This commit is contained in:
Bastian Blank 2013-10-26 21:04:10 +00:00
parent 6abbc6ca56
commit 16f09c4d48
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/bin/gencontrol.py vendored
View File

@ -43,7 +43,10 @@ class Gencontrol(Base):
} }
def __init__(self, config_dirs=["debian/config"], template_dirs=["debian/templates"]): def __init__(self, config_dirs=["debian/config"], template_dirs=["debian/templates"]):
super(Gencontrol, self).__init__(config.ConfigCoreHierarchy(self.config_schema, config_dirs), Templates(template_dirs), VersionLinux) super(Gencontrol, self).__init__(
config.ConfigCoreHierarchy(self.config_schema, config_dirs),
Templates(template_dirs),
VersionLinux)
self.process_changelog() self.process_changelog()
self.config_dirs = config_dirs self.config_dirs = config_dirs
@ -393,7 +396,9 @@ class Gencontrol(Base):
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags] cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
if packages_dummy: if packages_dummy:
cmds_binary_arch.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags)) cmds_binary_arch.append(
"$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s"
% (' '.join("-p%s" % i['Package'] for i in packages_dummy), makeflags))
cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags] cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags]
cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags] cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags]
makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch) makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch)
@ -470,16 +475,13 @@ class Gencontrol(Base):
if (version.linux_revision_experimental or if (version.linux_revision_experimental or
version.linux_revision_backports or version.linux_revision_backports or
version.linux_revision_other): version.linux_revision_other):
raise RuntimeError("Can't upload to %s with a version of %s" % raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
(distribution, version))
if distribution in ('experimental', ): if distribution in ('experimental', ):
if not version.linux_revision_experimental: if not version.linux_revision_experimental:
raise RuntimeError("Can't upload to %s with a version of %s" % raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
(distribution, version))
if distribution.endswith('-backports'): if distribution.endswith('-backports'):
if not version.linux_revision_backports: if not version.linux_revision_backports:
raise RuntimeError("Can't upload to %s with a version of %s" % raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
(distribution, version))
def process_real_image(self, entry, fields, vars): def process_real_image(self, entry, fields, vars):
entry = self.process_package(entry, vars) entry = self.process_package(entry, vars)

15
debian/bin/kconfig.py vendored
View File

@ -28,13 +28,14 @@ def opt_callback_dict(option, opt, value, parser):
if __name__ == '__main__': if __name__ == '__main__':
parser = optparse.OptionParser(usage="%prog [OPTION]... FILE...") parser = optparse.OptionParser(usage="%prog [OPTION]... FILE...")
parser.add_option('-o', '--override', parser.add_option(
action='callback', '-o', '--override',
callback=opt_callback_dict, action='callback',
default={}, callback=opt_callback_dict,
dest='overrides', default={},
help="Override option", dest='overrides',
type='string') help="Override option",
type='string')
options, args = parser.parse_args() options, args = parser.parse_args()
merge(args[0], args[1:], options.overrides) merge(args[0], args[1:], options.overrides)