af0098b10a
debian/bin, debian/lib/python: Fix most errors reported by pycodestyle
...
Fix coding style violations reported by pycodestyle. This is
mostly a matter of reformatting code, particularly to eliminate
over-long lines. I also rename one variable ("l" is considered
visually ambiguous) and change a bare "except" to explicitly
catch all exceptions.
There are three types of error or warning remaining:
- debian/bin/...: E402 module level import not at top of file
Scripts in debian/bin need to modify the import path before
importing from debian/lib/python.
- E127 continuation line over-indented for visual indent
This seems to be a false positive. pycodestyle doesn't seem to be
happy with any level of indent (including 0) on a continuation line
in a "with" statement.
- debian/lib/python/debian_linux/debian.py:15:2: W291 trailing whitespace
This is a false positive. The trailing spaces are in a long
string and are intentional.
2018-10-01 21:41:23 +01:00
581d83dbf0
debian_linux.utils._read_rfc822: Parse and ignore comments
2016-05-14 19:54:34 +01:00
5c869ad70b
debian_linux.{debian,utils}: Support templates for debian/tests/control
2015-10-31 22:04:13 +00:00
9c8d371306
debian_linux.utils: Support templates for RFC822 files other than debian/control
2015-10-31 22:04:13 +00:00
6b977589fb
debian/bin,debian/control,debian/lib/python: Use Python 3
2015-08-29 21:48:39 +01:00
03fab0311a
Don't require '.in' suffix on templates
...
The PO files processed by debconf-updatepo, which in our case are
templates, must have names ending in .po rather than .in. So look for
un-suffixed template files after looking for files with the .in
suffix.
svn path=/dists/trunk/linux/; revision=20504
2013-08-17 11:18:34 +00:00
141957a25b
debian/lib/python: Use unicode always.
...
svn path=/dists/trunk/linux-2.6/; revision=18493
2012-01-11 18:03:27 +00:00
e962c1ae2b
debian/lib/python: Remove SortedDict, use collections.OrderedDict instead.
...
svn path=/dists/trunk/linux-2.6/; revision=18491
2012-01-11 17:16:00 +00:00
9863acaddd
debian/lib/python: PEP8 and other style fixes.
...
svn path=/dists/trunk/linux-2.6/; revision=18488
2012-01-11 16:52:29 +00:00
cb043ef739
Fix debian_linux.utils.read_control to tolerate extra blank lines
...
svn path=/dists/trunk/linux-2.6/; revision=18042
2011-09-03 20:55:12 +00:00
07aafecfb1
Move debian_linux.utils.Templates._read_control out to module scope
...
svn path=/dists/trunk/linux-2.6/; revision=18041
2011-09-03 20:53:59 +00:00
6f09d6c8a8
debian/lib/python/debian_linux/utils.py: Only import debian module if needed.
...
svn path=/dists/trunk/linux-2.6/; revision=13648
2009-05-20 15:12:30 +00:00
90009cd8db
debian/lib/python/debian_linux/utils.py
...
- Don't implement the complete dict interface.
- Fix get behaviour on non-existant entries.
svn path=/dists/trunk/linux-2.6/; revision=13397
2009-04-12 10:27:59 +00:00
f7c50a1460
Revert "debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it."
...
as announced revert trunk sabotage
This reverts commit ccf3463f401b082e89a76d3475eff5b30c05622a.
svn path=/dists/trunk/linux-2.6/; revision=11215
2008-05-01 07:54:28 +00:00
fb5a6dc08c
debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it.
...
svn path=/dists/trunk/linux-2.6/; revision=11213
2008-04-27 06:26:15 +00:00
4b462b2692
debian/lib/python/debian_linux/utils.py (Templates)
...
- Add get method.
- Handle KeyError like dict.
svn path=/dists/trunk/linux-2.6/; revision=10135
2008-01-18 22:45:56 +00:00
5f0d29bcd9
* debian/lib/python/debian_linux/gencontrol.py:
...
Expect config and template dirs as list and set default.
* debian/lib/python/debian_linux/utils.py:
Read templates from a list of directories.
svn path=/dists/trunk/linux-2.6/; revision=9305
2007-08-15 14:29:58 +00:00
bb11d12939
debian/bin/gencontrol.py, debian/lib/python/debian_linux: Coding style cleanup.
...
svn path=/dists/trunk/linux-2.6/; revision=8981
2007-06-17 10:34:22 +00:00
a5af4e3da1
debian/lib/python/debian_linux/utils.py: Remove rmtree function.
...
svn path=/dists/trunk/linux-2.6/; revision=8223
2007-01-27 19:18:27 +00:00
bed9079aa8
debian/lib/python/debian_linux/utils.py: Add rmtree.
...
svn path=/dists/trunk/linux-2.6/; revision=7820
2006-11-19 12:13:25 +00:00
b709f276f1
debian/lib/python/debian_linux/utils.py: Support non control templates.
...
svn path=/dists/trunk/linux-2.6/; revision=6721
2006-05-28 19:51:27 +00:00
333210a7a7
r6005: waldi | 2006-03-02 11:06:40 +0100
...
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
r6006: waldi | 2006-03-02 11:16:14 +0100
* debian/lib/python/debian_linux/gencontrol.py: Add SOURCEVERSION.
* debian/rules.real
- Use SOURCEVERSION.
- Fix another brocken ABINAME usage.
r6007: waldi | 2006-03-02 11:41:01 +0100
* debian/arch/defines, debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/arm/defines, debian/arch/armeb/defines, debian/arch/hppa/defines,
debian/arch/i386/defines, debian/arch/ia64/defines, debian/arch/m68k/defines,
debian/arch/mips/defines, debian/arch/mipsel/defines,
debian/arch/powerpc/defines, debian/arch/s390/defines,
debian/arch/sparc/defines: Move image specific specs into image section.
* debian/bin/gencontrol.py: Use image section if neccesary.
* debian/lib/python/debian_linux/gencontrol.py: Support image section.
r6008: waldi | 2006-03-02 11:41:37 +0100
debian/lib/python/debian_linux/config.py: Remove old workaround.
r6009: waldi | 2006-03-02 12:15:21 +0100
* bin/gencontrol.py: Fix image description addition.
* lib/python/debian_linux/debian.py: Parse Description also.
* lib/python/debian_linux/gencontrol.py: Fix Description setup.
* lib/python/debian_linux/utils.py: Always provide the complete text.
r6010: waldi | 2006-03-02 12:42:47 +0100
* debian/arch/defines: Add initramfs-generator relations.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
debian/arch/arm/defines, debian/arch/armeb/defines, debian/arch/hppa/defines,
debian/arch/i386/defines, debian/arch/ia64/defines, debian/arch/m68k/defines,
debian/arch/mips/defines, debian/arch/mipsel/defines,
debian/arch/powerpc/defines, debian/arch/powerpc/vserver/defines,
debian/arch/s390/defines, debian/arch/sparc/defines:
Specify initramfs settings.
* debian/bin/gencontrol.py: Generate dependencies for initramfs generators.
* debian/lib/python/debian_linux/config.py: Add more fields.
* debian/lib/python/debian_linux/gencontrol.py: Fix.
* debian/rules.real: Use INITRAMFS.
r6011: waldi | 2006-03-02 13:05:45 +0100
debian/bin/gencontrol.py,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.
r6012: waldi | 2006-03-02 13:20:58 +0100
debian/lib/python/debian_linux/config.py: Fix section parsing.
r6013: waldi | 2006-03-02 13:27:44 +0100
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.
r6014: waldi | 2006-03-02 13:30:30 +0100
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
Remove another usage of the image config sections.
r6030: waldi | 2006-03-02 17:44:17 +0100
debian/bin/gencontrol.py: Provide correct localversion for the headers build.
svn path=/dists/trunk/linux-2.6/; revision=6031
2006-03-02 16:47:30 +00:00
5950daef7d
r5566: waldi | 2006-01-22 21:27:35 +0100
...
debian/lib/python/debian_linux/utils.py: Remove old class.
r5694: waldi | 2006-02-03 01:03:03 +0100
debian/lib/python/debian_linux/utils.py: Fix class name.
r5827: waldi | 2006-02-11 23:21:50 +0100
* debian/bin/touch: Remove.
* debian/rules.real: Remove touch.orig setup.
r5828: waldi | 2006-02-11 23:24:10 +0100
debian/rules.real: Don't overwrite parts of the kernel source.
r5873: waldi | 2006-02-13 23:09:59 +0100
debian/rules.real: Always call dh_installdocs and dh_installchangelogs.
svn path=/dists/trunk/linux-2.6/; revision=5915
2006-02-17 15:50:39 +00:00
b37871ac10
* Set compiler build dependencies from config informations.
...
* Install debian/lib into headers-all package.
* Unlink version file before writing to them.
* debian/README: Remove outdated information.
r5275: waldi | 2006-01-05 14:00:15 +0100
* debian/lib/python/debian_linux/debian.py: Move package class from utils.
* debian/lib/python/debian_linux/utils.py: Use package class from debian.
r5277: waldi | 2006-01-05 14:41:45 +0100
* debian/lib/python/debian_linux/debian.py
- Add package_relation, package_relation_list and package_relation_group
classes.
- Use them in the package class.
* debian/lib/python/debian_linux/gencontrol.py
- Support new relation classes.
r5278: waldi | 2006-01-05 14:46:55 +0100
debian/bin/gencontrol.py: Use relation objects for tree entry.
r5279: waldi | 2006-01-05 15:20:00 +0100
* debian/bin/gencontrol.py: Don't fail if some relation fields are empty.
* debian/lib/python/debian_linux/debian.py: Merge relation entries.
r5280: waldi | 2006-01-05 15:24:08 +0100
* debian/arch/defines, debian/arch/hppa/defines: Set relations for compiler.
* debian/lib/python/debian_linux/gencontrol.py: Set compiler build dependencies
from config informations.
* debian/templates/control.source.in: Remove compiler from Build-Depends.
r5281: waldi | 2006-01-05 15:39:45 +0100
* debian/rules.real
- Install debian/lib into headers-all package.
- Call dh_python with python version 2.4.
* debian/templates/control.source.in:
Add python to build-depends, needed by dh_python.
r5282: waldi | 2006-01-05 16:36:33 +0100
debian/rules.real
- Remove outdated comment about include_common_config.
- Remove support for headers_dirs.
r5283: waldi | 2006-01-05 16:38:05 +0100
debian/arch/amd64/Makefile.inc, debian/arch/arm/Makefile.inc,
debian/arch/hppa/Makefile.inc, debian/arch/powerpc/Makefile.inc,
debian/arch/sparc/Makefile.inc: Remove not longer supported variables.
r5284: waldi | 2006-01-05 16:42:33 +0100
debian/lib/python/debian_linux/gencontrol.py:
Warn if the class setting is not available.
r5287: waldi | 2006-01-05 19:07:05 +0100
debian/arch/powerpc/defines: Set kernel-arch for all except powerpc64 to ppc.
r5288: waldi | 2006-01-05 19:08:35 +0100
debian/lib/python/debian_linux/config.py:
Only bail out if a section is not found in any config file.
r5294: waldi | 2006-01-05 19:26:57 +0100
debian/lib/python/debian_linux/gencontrol.py
- Support config underlay.
- Add some small default implementations.
r5295: waldi | 2006-01-05 19:39:55 +0100
debian/README: Remove outdated information.
r5325: waldi | 2006-01-06 22:40:17 +0100
debian/bin/apply.py
- Don't reference the debian_linux module, it is not available.
- Unlink version file before writing to them.
svn path=/dists/trunk/linux-2.6/; revision=5327
2006-01-06 22:32:16 +00:00
f5ea6ce508
* Move most parts of debian/bin/gencontrol.py to debian/lib.
...
* Implement subarch.
* Rewrite patch handling to integrate arch and subarch specific patches.
r4300: waldi | 2005-10-03 22:23:02 +0200
debian/rules.real: Remove old definitions.
r4304: waldi | 2005-10-03 23:02:13 +0200
Move template reading to lib.
* debian/bin/gencontrol.py
- Remove RFC822 routines.
- Use templates class.
* debian/lib/python/debian_linux.py: Add templates class.
r4738: waldi | 2005-11-07 15:51:30 +0100
debian/bin/gencontrol.py: Set TYPE.
r4796: waldi | 2005-11-13 15:09:40 +0100
* debian/bin/gencontrol.py: Use config_reader.
* debian/lib/python/debian_linux: Add directory.
* debian/lib/python/debian_linux/__init__.py: Move from debian/lib/python/python/debian_linux.py.
* debian/lib/python/debian_linux/config.py: Add config_reader and config_parser.
r4797: waldi | 2005-11-13 15:45:12 +0100
* debian/bin/gencontrol.py: Move code away. For now only use imported code.
* debian/lib/python/debian_linux/__init__.py: Remove utils.
* debian/lib/python/debian_linux/config.py: Update.
* debian/lib/python/debian_linux/debian.py: Add debian packaging specific code.
* debian/lib/python/debian_linux/gencontrol.py: Add code.
* debian/lib/python/debian_linux/utils.py: Add utils.
r4798: waldi | 2005-11-13 15:56:37 +0100
debian/lib/python/debian_linux/gencontrol.py:
Don't try to generation extra packages if the template does not exist.
r4799: waldi | 2005-11-13 16:04:25 +0100
debian/lib/python/debian_linux/gencontrol.py:
Begin to split methods in smaller pieces.
r4800: waldi | 2005-11-13 16:26:03 +0100
debian/lib/python/debian_linux/gencontrol.py: Split more code.
r4802: waldi | 2005-11-13 16:40:08 +0100
debian/lib/python/debian_linux/gencontrol.py: Also allow strings in makefile write list.
r4806: waldi | 2005-11-13 16:55:48 +0100
debian/bin/gencontrol.py: Move linux-2.6 specific code from
debian/lib/python/debian_linux/gencontrol.py.
r4807: waldi | 2005-11-13 17:07:26 +0100
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py: Update.
r4808: waldi | 2005-11-13 17:08:53 +0100
debian/bin/gencontrol.py: Move code from debian/lib/python/debian_linux/gencontrol.py.
r4810: waldi | 2005-11-13 17:10:30 +0100
debian/bin/gencontrol.py
- Move code from debian/lib/python/debian_linux/gencontrol.py.
- Update.
r4811: waldi | 2005-11-13 17:33:47 +0100
debian/bin/gencontrol.py: Move code from debian/lib/python/debian_linux/gencontrol.py.
r4812: waldi | 2005-11-13 17:36:38 +0100
debian/bin/gencontrol.py: Update.
r4813: waldi | 2005-11-13 18:36:28 +0100
debian/lib/python/debian_linux/config.py: Remove old code.
r4814: waldi | 2005-11-13 18:38:50 +0100
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/lib/python/debian_linux/utils.py: Teach package object how to
work with list attributes.
* debian/lib/python/debian_linux/debian.py: Don't use utils.entry.
r4815: waldi | 2005-11-13 18:41:55 +0100
* debian/lib/python/debian_linux/gencontrol.py
- Use utils.package.
- Remove debugging code.
* debian/lib/python/debian_linux/utils.py
- Use utils.package.
- Remove utils.entry.
r4816: waldi | 2005-11-13 18:47:46 +0100
debian/lib/python/debian_linux/utils.py: Don't output empty fields.
r4965: waldi | 2005-12-04 12:36:20 +0100
Rewrite config reader to support more than one section per (arch, subarch, flavour).
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py:
Explicitely Use base entries.
* debian/lib/python/debian_linux/config.py
- Rewrite.
- Loose support for entry merging for now.
r5175: waldi | 2006-01-02 20:46:46 +0100
debian/bin/gencontrol.py: Fix.
r5176: waldi | 2006-01-02 21:09:17 +0100
* debian/bin/apply: Don't expect upstream version in series file names.
* debian/patches-debian/series/0experimental.1:
Move from debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1.
* debian/patches-debian/series/0experimental.2:
Move from debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.2.
r5177: waldi | 2006-01-02 22:31:28 +0100
First prototype of improved patch util.
debian/bin/apply.py: Add.
r5178: waldi | 2006-01-02 23:40:11 +0100
* debian/bin/apply.py: Finish implementation.
* debian/rules.real: Use apply.py.
r5179: waldi | 2006-01-03 00:15:05 +0100
* debian/bin/apply.py: Implement arch and subarch specific patches.
* debian/bin/unpatch: Remove old code.
* debian/rules.real: Fix patch package installation.
r5180: waldi | 2006-01-03 00:16:05 +0100
debian/bin/apply: Remove.
r5181: waldi | 2006-01-03 00:16:56 +0100
* debian/bin/gencontrol.py: Readd missing build target.
* debian/lib/python/debian_linux/debian.py: Raise if version is not parsable.
r5192: waldi | 2006-01-03 15:32:43 +0100
debian/bin/apply.py
- Add version_file class.
- Use correct series for deapply.
r5193: waldi | 2006-01-03 15:41:53 +0100
debian/bin/apply.py
- Remove extra version handling from series class.
- Add check for extra version in patch setup.
r5194: waldi | 2006-01-03 15:45:49 +0100
debian/bin/apply.py: Move complete reverse logic into series class.
r5195: waldi | 2006-01-03 16:14:33 +0100
debian/bin/apply.py: Implement patch per arch and subarch. It is currently done
by completely deapply the arch specific patches if it needs to change set of
general patches.
r5196: waldi | 2006-01-03 16:18:55 +0100
debian/bin/apply.py: Don't record extra version without patch.
r5197: waldi | 2006-01-03 16:25:03 +0100
debian/bin/apply.py: Record shortest possible extra version in version file.
r5198: waldi | 2006-01-03 16:28:00 +0100
* debian/patches-debian/series/0experimental.3-extra: Add.
* debian/patches-debian/hppa-incompatible.patch:
Move from debian/patches-arch/hppa.diff.
* debian/patches-debian/m68k-incompatible.patch
Move from debian/patches-arch/m68k.diff.
* debian/patches-arch: Remove.
r5200: waldi | 2006-01-03 16:30:03 +0100
debian/rules.real: Use new apply script for arch and subarch patches.
r5207: waldi | 2006-01-03 17:12:52 +0100
* debian/rules.real: Remove old arch patches installation.
* debian/templates/control.source.in: Remove dh-kpatches from Buld-Depends-Indep.
r5208: waldi | 2006-01-03 17:21:21 +0100
debian/lib/python/debian_linux: Set svn:ignore property.
r5210: waldi | 2006-01-03 17:24:09 +0100
debian/templates/control.main.in: Fix depends of patch package.
r5212: waldi | 2006-01-03 17:54:18 +0100
* debian/rules: Fix clean.
* debian/rules.real
- Remove definition of old arch patches.
- Use a variable for patch command.
r5213: waldi | 2006-01-03 20:45:41 +0100
* debian/templates: Move subarch part in package names in front of flavour.
* debian/lib/python/debian_linux/gencontrol.py: Fix subarch text setting.
r5214: waldi | 2006-01-03 20:46:05 +0100
debian/lib/python/debian_linux/config.py: Support subarches.
r5215: waldi | 2006-01-04 00:51:46 +0100
Update svn:ignore property.
r5216: waldi | 2006-01-04 00:53:20 +0100
debian/bin/apply.py
- Use correct length in extra check.
- Check for correct length of extra entries.
r5217: waldi | 2006-01-04 00:54:38 +0100
debian/rules.real
- Append subarch to kernel version.
- Fix base of kconfig.ml call.
r5234: waldi | 2006-01-04 15:34:59 +0100
* debian/bin/gencontrol.py: Use config entry merging when needed.
* lib/python/debian_linux/config.py: Readd config entry merging.
r5235: waldi | 2006-01-04 16:00:38 +0100
* debian/bin/install-image: Use DEBIAN_LOCALVERSION and DEBIAN_LOCALVERSION_HEADERS.
* debian/rules.real: Set LOCALVERSION for scripts.
r5240: waldi | 2006-01-04 17:50:12 +0100
debian/rules.real: Fix version of subarch headers package.
svn path=/dists/trunk/linux-2.6/; revision=5242
2006-01-04 19:33:32 +00:00
Ben Hutchings
Ben Hutchings
Bastian Blank
Maximilian Attems