From 4ba6b46206a03bf6815d46cff12cfb0c2033795c Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 9 Sep 2018 17:57:26 +0300 Subject: Fix: append .distribution only in one place --- ick_helpers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ick_helpers.py b/ick_helpers.py index b363b45..b1c9e2f 100644 --- a/ick_helpers.py +++ b/ick_helpers.py @@ -190,11 +190,9 @@ class DebianBuilderBase: env = dict(os.environ) env['DEBFULLNAME'] = self.debfullname env['DEBEMAIL'] = self.debemail - newver = '{}.{}'.format(version.full, distribution) - debug('newver:', newver) msg = 'Build in ick.' self.ex.run( - 'dch', '--no-conf', '-v', newver, '-D', distribution, + 'dch', '--no-conf', '-v', str(version), '-D', distribution, '--force-distribution', msg, env=env) self.ex.run('dch', '--no-conf', '-r', '', env=env) @@ -222,6 +220,9 @@ class DebianReleaseBuilder(DebianBuilderBase): version = self.get_version() curdist = self.get_distribution() + morever = '.{}'.format(distribution) + version.upstream_append(morever) + orig_tarball = self.create_debian_orig_tarball( upstream_tarball, source, version) -- cgit v1.2.1