[kernel] r19308 - in dists/trunk/linux/debian: . lib/python/debian_linux

[Ben Hutchings]

Author: benh
Date: Sat Aug  4 13:44:08 2012
New Revision: 19308

Log:
Fix linux_upstream_full compute for version with modifier

From: Julien Danjou <julien at danjou.info>

If you try to use genorig on a version with a modifier (like ~rc1), it will
fail because self.linux_upstream_full will be equal to the short version
rather than version-modifier.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/lib/python/debian_linux/debian.py

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Aug  4 13:32:28 2012	(r19307)
+++ dists/trunk/linux/debian/changelog	Sat Aug  4 13:44:08 2012	(r19308)
@@ -1,3 +1,11 @@
+linux (3.5-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * genorig: Fix linux_upstream_full compute for version with modifier,
+    thanks to Julien Danjou (Closes: #683824)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 Aug 2012 14:43:08 +0100
+
 linux (3.5-1~experimental.1) experimental; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.5

Modified: dists/trunk/linux/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux/debian/lib/python/debian_linux/debian.py	Sat Aug  4 13:32:28 2012	(r19307)
+++ dists/trunk/linux/debian/lib/python/debian_linux/debian.py	Sat Aug  4 13:44:08 2012	(r19308)
@@ -154,7 +154,7 @@
             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_upstream_full = self.linux_upstream + (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