From a0f368121520b40e70365c3f968d9053595b3357 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 4 Aug 2012 13:44:08 +0000 Subject: [PATCH] Fix linux_upstream_full compute for version with modifier From: Julien Danjou 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. svn path=/dists/trunk/linux/; revision=19308 --- debian/changelog | 8 ++++++++ debian/lib/python/debian_linux/debian.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 654b4b545..93e9fcfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 7daaa03e0..a57752658 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -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