[kernel] r22542 - in dists/wheezy-backports/linux/debian: . bin lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Mon Apr 27 19:55:43 2015
New Revision: 22542

Log:
debian.py,gencontrol.py: Fix the version sanity checks for backports and security/LTS uploads

Modified:
   dists/wheezy-backports/linux/debian/bin/gencontrol.py
   dists/wheezy-backports/linux/debian/changelog
   dists/wheezy-backports/linux/debian/lib/python/debian_linux/debian.py

Modified: dists/wheezy-backports/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/wheezy-backports/linux/debian/bin/gencontrol.py	Mon Apr 27 19:50:38 2015	(r22541)
+++ dists/wheezy-backports/linux/debian/bin/gencontrol.py	Mon Apr 27 19:55:43 2015	(r22542)
@@ -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/wheezy-backports/linux/debian/changelog
==============================================================================
--- dists/wheezy-backports/linux/debian/changelog	Mon Apr 27 19:50:38 2015	(r22541)
+++ dists/wheezy-backports/linux/debian/changelog	Mon Apr 27 19:55:43 2015	(r22542)
@@ -7,6 +7,8 @@
     - [arm] btrfs: Work around bug in gcc-4.6 (fixes FTBFS)
     - linux-image: Depend on initramfs-tools without any alternatives, so
       that neither apt nor aptitude will automatically switch to dracut
+    - 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 20:13:07 +0100
 

Modified: dists/wheezy-backports/linux/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/wheezy-backports/linux/debian/lib/python/debian_linux/debian.py	Mon Apr 27 19:50:38 2015	(r22541)
+++ dists/wheezy-backports/linux/debian/lib/python/debian_linux/debian.py	Mon Apr 27 19:55:43 2015	(r22542)
@@ -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