From a0f368121520b40e70365c3f968d9053595b3357 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 4 Aug 2012 13:44:08 +0000 Subject: 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/lib/python/debian_linux/debian.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/lib/python') diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 7daaa03e072d..a577526582e5 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 -- cgit v1.2.3