diff options
| author | Ben Hutchings <benh@debian.org> | 2012-08-04 13:44:08 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-08-04 13:44:08 +0000 |
| commit | a0f368121520b40e70365c3f968d9053595b3357 (patch) | |
| tree | 3a04c881290b521e304ce050578f76859e3fb2c4 /debian/lib/python/debian_linux/debian.py | |
| parent | d056eaeb23c7b4444b266e3129252d8281bbb357 (diff) | |
| download | kernel_replicant_linux-a0f368121520b40e70365c3f968d9053595b3357.tar.gz kernel_replicant_linux-a0f368121520b40e70365c3f968d9053595b3357.tar.bz2 kernel_replicant_linux-a0f368121520b40e70365c3f968d9053595b3357.zip | |
Fix linux_upstream_full compute for version with modifier
From: Julien Danjou <julien@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.
svn path=/dists/trunk/linux/; revision=19308
Diffstat (limited to 'debian/lib/python/debian_linux/debian.py')
| -rw-r--r-- | debian/lib/python/debian_linux/debian.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |