[kernel] r18489 - dists/trunk/linux-2.6/debian/bin
Bastian Blank
waldi at alioth.debian.org
Wed Jan 11 17:00:29 UTC 2012
Author: waldi
Date: Wed Jan 11 17:00:17 2012
New Revision: 18489
Log:
debian/bin: PEP8 and other style fixes.
Modified:
dists/trunk/linux-2.6/debian/bin/abiupdate.py
dists/trunk/linux-2.6/debian/bin/buildcheck.py
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/bin/genorig.py
dists/trunk/linux-2.6/debian/bin/kconfig.py
Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py Wed Jan 11 16:52:29 2012 (r18488)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py Wed Jan 11 17:00:17 2012 (r18489)
@@ -3,7 +3,12 @@
import sys
sys.path.append(sys.path[0] + "/../lib/python")
-import optparse, os, shutil, tempfile, urllib2
+import optparse
+import os
+import shutil
+import tempfile
+import urllib2
+
from debian_linux.abi import Symbols
from debian_linux.config import *
from debian_linux.debian import *
@@ -11,6 +16,7 @@
default_url_base = "http://ftp.de.debian.org/debian/"
default_url_base_incoming = "http://incoming.debian.org/"
+
class url_debian_flat(object):
def __init__(self, base):
self.base = base
@@ -18,6 +24,7 @@
def __call__(self, source, filename):
return self.base + filename
+
class url_debian_pool(object):
def __init__(self, base):
self.base = base
@@ -25,10 +32,11 @@
def __call__(self, source, filename):
return self.base + "pool/main/" + source[0] + "/" + source + "/" + filename
-class main(object):
+
+class Main(object):
dir = None
- def __init__(self, url, url_config = None, arch = None, featureset = None, flavour = None):
+ def __init__(self, url, url_config=None, arch=None, featureset=None, flavour=None):
self.log = sys.stdout.write
self.url = self.url_config = url
@@ -38,7 +46,7 @@
self.override_featureset = featureset
self.override_flavour = flavour
- changelog = Changelog(version = VersionLinux)
+ changelog = Changelog(version=VersionLinux)
while changelog[0].distribution == 'UNRELEASED':
changelog.pop(0)
changelog = changelog[0]
@@ -47,12 +55,12 @@
self.version = changelog.version.linux_version
self.version_source = changelog.version.complete
- local_config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
+ local_config = ConfigCoreDump(fp=file("debian/config.defines.dump"))
- self.version_abi = local_config['version',]['abiname']
+ self.version_abi = local_config['version', ]['abiname']
def __call__(self):
- self.dir = tempfile.mkdtemp(prefix = 'abiupdate')
+ self.dir = tempfile.mkdtemp(prefix='abiupdate')
try:
self.log("Retreive config\n")
config = self.get_config()
@@ -85,7 +93,7 @@
f = self.retrieve_package(self.url_config, filename)
d = self.extract_package(f, "linux-support")
c = d + "/usr/src/linux-support-" + self.version_abi + "/config.defines.dump"
- config = ConfigCoreDump(fp = file(c))
+ config = ConfigCoreDump(fp=file(c))
shutil.rmtree(d)
return config
@@ -155,20 +163,20 @@
if __name__ == '__main__':
options = optparse.OptionParser()
- options.add_option("-i", "--incoming", action = "store_true", dest = "incoming")
- options.add_option("--incoming-config", action = "store_true", dest = "incoming_config")
- options.add_option("-u", "--url-base", dest = "url_base", default = default_url_base)
- options.add_option("--url-base-incoming", dest = "url_base_incoming", default = default_url_base_incoming)
+ options.add_option("-i", "--incoming", action="store_true", dest="incoming")
+ options.add_option("--incoming-config", action="store_true", dest="incoming_config")
+ options.add_option("-u", "--url-base", dest="url_base", default=default_url_base)
+ options.add_option("--url-base-incoming", dest="url_base_incoming", default=default_url_base_incoming)
opts, args = options.parse_args()
kw = {}
if len(args) >= 1:
- kw['arch'] =args[0]
+ kw['arch'] = args[0]
if len(args) >= 2:
- kw['featureset'] =args[1]
+ kw['featureset'] = args[1]
if len(args) >= 3:
- kw['flavour'] =args[2]
+ kw['flavour'] = args[2]
url_base = url_debian_pool(opts.url_base)
url_base_incoming = url_debian_flat(opts.url_base_incoming)
Modified: dists/trunk/linux-2.6/debian/bin/buildcheck.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/buildcheck.py Wed Jan 11 16:52:29 2012 (r18488)
+++ dists/trunk/linux-2.6/debian/bin/buildcheck.py Wed Jan 11 17:00:17 2012 (r18489)
@@ -46,7 +46,7 @@
changelog = Changelog(version=VersionLinux)[0]
version = changelog.version.linux_version
- abiname = self.config['abi',]['abiname']
+ abiname = self.config['abi', ]['abiname']
self.filename_ref = "debian/abi/%s-%s/%s_%s_%s" % (version, abiname, arch, featureset, flavour)
def __call__(self, out):
@@ -163,7 +163,7 @@
raise NotImplementedError
return filtered
-
+
class CheckImage(object):
def __init__(self, config, dir, arch, featureset, flavour):
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 16:52:29 2012 (r18488)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 17:00:17 2012 (r18489)
@@ -1,15 +1,20 @@
#!/usr/bin/env python
-import os, os.path, subprocess, sys
+import sys
sys.path.append("debian/lib/python")
+import os
+import os.path
+import subprocess
+
from debian_linux.config import ConfigCoreHierarchy
from debian_linux.debian import *
from debian_linux.gencontrol import Gencontrol as Base
from debian_linux.utils import Templates, read_control
+
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__(ConfigCoreHierarchy(config_dirs), Templates(template_dirs), VersionLinux)
self.process_changelog()
self.config_dirs = config_dirs
@@ -53,7 +58,7 @@
libc_dev = self.templates["control.libc-dev"]
packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
-
+
packages_headers_arch[-1]['Depends'].extend(PackageRelation())
extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
@@ -61,8 +66,8 @@
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags]
cmds_source = ["$(MAKE) -f debian/rules.real source-arch %s" % makeflags]
- makefile.add('binary-arch_%s_real' % arch, cmds = cmds_binary_arch)
- makefile.add('source_%s_real' % arch, cmds = cmds_source)
+ makefile.add('binary-arch_%s_real' % arch, cmds=cmds_binary_arch)
+ makefile.add('source_%s_real' % arch, cmds=cmds_source)
# Shortcut to aid architecture bootstrapping
makefile.add('binary-libc-dev_%s' % arch,
@@ -94,7 +99,7 @@
# per-featureset packages.
makefile.add(
'binary-arch_%s' % arch,
- cmds = ["$(MAKE) -f debian/rules.real install-udeb_%s %s "
+ cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
"PACKAGE_NAMES='%s'" %
(arch, makeflags,
' '.join(p['Package'] for p in udeb_packages))])
@@ -111,8 +116,8 @@
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-featureset %s" % makeflags]
cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s" % makeflags]
- makefile.add('binary-arch_%s_%s_real' % (arch, featureset), cmds = cmds_binary_arch)
- makefile.add('source_%s_%s_real' % (arch, featureset), cmds = cmds_source)
+ makefile.add('binary-arch_%s_%s_real' % (arch, featureset), cmds=cmds_binary_arch)
+ makefile.add('source_%s_%s_real' % (arch, featureset), cmds=cmds_source)
flavour_makeflags_base = (
('compiler', 'COMPILER', False),
@@ -299,9 +304,9 @@
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 %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('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_build)
- makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_setup)
+ makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch)
+ makefile.add('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
+ makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup)
def do_extra(self, packages, makefile):
apply = self.templates['patch.apply']
@@ -348,7 +353,7 @@
if self.version.linux_modifier is not None:
self.abiname_part = ''
else:
- self.abiname_part = '-%s' % self.config['abi',]['abiname']
+ self.abiname_part = '-%s' % self.config['abi', ]['abiname']
# XXX: We need to add another part until after wheezy
self.abiname = (re.sub('^(\d+\.\d+)(?=-|$)', r'\1.0',
self.version.linux_upstream)
@@ -360,7 +365,7 @@
'source_package': self.changelog[0].source,
'abiname': self.abiname,
}
- self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname}
+ self.config['version', ] = {'source': self.version.complete, 'abiname': self.abiname}
distribution = self.changelog[0].distribution
if distribution in ('unstable', ):
Modified: dists/trunk/linux-2.6/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/genorig.py Wed Jan 11 16:52:29 2012 (r18488)
+++ dists/trunk/linux-2.6/debian/bin/genorig.py Wed Jan 11 17:00:17 2012 (r18489)
@@ -12,13 +12,14 @@
from debian_linux.debian import Changelog, VersionLinux
from debian_linux.patches import PatchSeries
+
class Main(object):
def __init__(self, input_files, override_version):
self.log = sys.stdout.write
self.input_files = input_files
- changelog = Changelog(version = VersionLinux)[0]
+ changelog = Changelog(version=VersionLinux)[0]
source = changelog.source
version = changelog.version
@@ -38,7 +39,7 @@
def __call__(self):
import tempfile
- self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian')
+ self.dir = tempfile.mkdtemp(prefix='genorig', dir='debian')
try:
if os.path.isdir(self.input_files[0]):
self.upstream_export(self.input_files[0])
@@ -103,17 +104,19 @@
self.log("Patching source with debian patch (series %s)\n" % name)
fp = file("debian/patches/series/" + name)
series = PatchSeries(name, "debian/patches", fp)
- series(dir = os.path.join(self.dir, self.orig))
+ series(dir=os.path.join(self.dir, self.orig))
def tar(self):
out = os.path.join("../orig", self.orig_tar)
try:
os.mkdir("../orig")
- except OSError: pass
+ except OSError:
+ pass
try:
os.stat(out)
raise RuntimeError("Destination already exists")
- except OSError: pass
+ except OSError:
+ pass
self.log("Generate tarball %s\n" % out)
cmdline = ['tar -czf', out, '-C', self.dir, self.orig]
try:
@@ -129,8 +132,8 @@
if __name__ == '__main__':
from optparse import OptionParser
- parser = OptionParser(usage = "%prog [OPTION]... {TAR [PATCH] | REPO}")
- parser.add_option("-V", "--override-version", dest = "override_version", help = "Override version", metavar = "VERSION")
+ parser = OptionParser(usage="%prog [OPTION]... {TAR [PATCH] | REPO}")
+ parser.add_option("-V", "--override-version", dest="override_version", help="Override version", metavar="VERSION")
options, args = parser.parse_args()
assert 1 <= len(args) <= 2
Modified: dists/trunk/linux-2.6/debian/bin/kconfig.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/kconfig.py Wed Jan 11 16:52:29 2012 (r18488)
+++ dists/trunk/linux-2.6/debian/bin/kconfig.py Wed Jan 11 17:00:17 2012 (r18489)
@@ -7,6 +7,7 @@
from debian_linux.kconfig import *
+
def merge(output, configs, overrides):
kconfig = KconfigFile()
for c in configs:
@@ -15,6 +16,7 @@
kconfig.set(key, value)
file(output, "w").write(str(kconfig))
+
def opt_callback_dict(option, opt, value, parser):
match = re.match('^\s*(\S+)=(\S+)\s*$', value)
if not match:
@@ -23,8 +25,9 @@
data = getattr(parser.values, dest)
data[match.group(1)] = match.group(2)
+
if __name__ == '__main__':
- parser = optparse.OptionParser(usage = "%prog [OPTION]... FILE...")
+ parser = optparse.OptionParser(usage="%prog [OPTION]... FILE...")
parser.add_option('-o', '--override',
action='callback',
callback=opt_callback_dict,
More information about the Kernel-svn-changes
mailing list