[kernel] r22548 - in dists/jessie/linux/debian: . bin lib/python/debian_linux
Ben Hutchings
benh at moszumanska.debian.org
Mon Apr 27 20:18:01 UTC 2015
Author: benh
Date: Mon Apr 27 20:18:01 2015
New Revision: 22548
Log:
debian.py,gencontrol.py: Fix the version sanity checks for backports and security/LTS uploads
Modified:
dists/jessie/linux/debian/bin/gencontrol.py
dists/jessie/linux/debian/changelog
dists/jessie/linux/debian/lib/python/debian_linux/debian.py
Modified: dists/jessie/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/jessie/linux/debian/bin/gencontrol.py Mon Apr 27 20:14:21 2015 (r22547)
+++ dists/jessie/linux/debian/bin/gencontrol.py Mon Apr 27 20:18:01 2015 (r22548)
@@ -490,6 +490,10 @@
if distribution in ('experimental', ):
if not version.linux_revision_experimental:
raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
+ if distribution.endswith('-security') or distribution.endswith('-lts'):
+ if (not version.linux_revision_security or
+ version.linux_revision_backports):
+ raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
if distribution.endswith('-backports'):
if not version.linux_revision_backports:
raise RuntimeError("Can't upload to %s with a version of %s" % (distribution, version))
Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog Mon Apr 27 20:14:21 2015 (r22547)
+++ dists/jessie/linux/debian/changelog Mon Apr 27 20:18:01 2015 (r22548)
@@ -1,3 +1,10 @@
+linux (3.16.7-ckt9-4) UNRELEASED; urgency=medium
+
+ * debian.py,gencontrol.py: Fix the version sanity checks for backports
+ and security/LTS uploads
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 27 Apr 2015 21:17:17 +0100
+
linux (3.16.7-ckt9-3~deb8u1) jessie-security; urgency=high
[ Ben Hutchings ]
Modified: dists/jessie/linux/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/jessie/linux/debian/lib/python/debian_linux/debian.py Mon Apr 27 20:14:21 2015 (r22547)
+++ dists/jessie/linux/debian/lib/python/debian_linux/debian.py Mon Apr 27 20:18:01 2015 (r22548)
@@ -139,14 +139,17 @@
~exp\d+
)
|
+ (?P<revision_security>
+ [~+]deb\d+u\d+
+ )?
(?P<revision_backports>
- ~bpo\d\d\+\d+
- )
+ ~bpo\d+\+\d+
+ )?
|
(?P<revision_other>
[^-]+
)
-)?
+)
$
"""
_version_linux_re = re.compile(_version_linux_rules, re.X)
@@ -167,6 +170,7 @@
self.linux_upstream_full = self.linux_upstream + d['update']
self.linux_dfsg = d['dfsg']
self.linux_revision_experimental = match.group('revision_experimental') and True
+ self.linux_revision_security = match.group('revision_security') and True
self.linux_revision_backports = match.group('revision_backports') and True
self.linux_revision_other = match.group('revision_other') and True
More information about the Kernel-svn-changes
mailing list