[kernel] r19055 - in dists/sid/linux-2.6/debian: bin lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Sat Jun  2 20:17:17 2012
New Revision: 19055

Log:
Fix version parsing in debian/bin/genorig.py when using a DFSG number

Modified:
   dists/sid/linux-2.6/debian/bin/genorig.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py

Modified: dists/sid/linux-2.6/debian/bin/genorig.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/genorig.py	Fri Jun  1 15:11:07 2012	(r19054)
+++ dists/sid/linux-2.6/debian/bin/genorig.py	Sat Jun  2 20:17:17 2012	(r19055)
@@ -34,8 +34,7 @@
 
         self.orig = '%s-%s' % (source, version.upstream)
         self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream)
-        self.tag = 'v' + re.sub(r"^(\d+\.\d+)\.0", r"\1",
-                                version.upstream.replace('~', '-'))
+        self.tag = 'v' + version.linux_upstream_full
 
     def __call__(self):
         import tempfile

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py	Fri Jun  1 15:11:07 2012	(r19054)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py	Sat Jun  2 20:17:17 2012	(r19055)
@@ -110,7 +110,7 @@
 (?P<version>
     \d+\.\d+
 )
-(?:
+(?P<update>
     \.\d+
 )?
 (?:
@@ -150,9 +150,11 @@
         self.linux_modifier = d['modifier']
         self.linux_version = d['version']
         if d['modifier'] is not None:
+            assert not d['update']
             self.linux_upstream = u'-'.join((d['version'], d['modifier']))
         else:
             self.linux_upstream = d['version']
+        self.linux_upstream_full = d['version'] + (d['update'] or u'')
         self.linux_dfsg = d['dfsg']
         self.linux_revision_experimental = match.group('revision_experimental') and True
         self.linux_revision_other = match.group('revision_other') and True