From 70369b4fa0604c00c3c25410110c8bcf9e4af341 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 17 Aug 2010 13:07:37 +0200 Subject: [PATCH] sponsor-patch: Make sure that the source tarball is uploaded if it's not in the archive. --- sponsor-patch | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sponsor-patch b/sponsor-patch index 2a02130..3c4dd8c 100755 --- a/sponsor-patch +++ b/sponsor-patch @@ -71,6 +71,13 @@ class BugTask(object): result += " (" + self.series + ")" return result + def get_previous_version(self): + if self.is_merge(): + previous_version = self.get_latest_released_version() + else: + previous_version = self.get_version() + return previous_version + def get_series(self, latest_release=False): if self.series is None or latest_release: return self.launchpad.distributions[self.project].current_series.name @@ -445,16 +452,13 @@ def main(script_name, bug_number, build, edit, keyid, upload, verbose=False): # Build source package cmd = ["debuild", "--no-lintian", "-S"] - if task.is_merge(): - ubuntu_version = task.get_latest_released_version() - cmd.append("-v" + ubuntu_version.full_version) - if ubuntu_version.upstream_version == changelog.upstream_version \ - and upload == "ubuntu": - cmd.append("-sd") - else: - cmd.append("-sa") + previous_version = task.get_previous_version() + cmd.append("-v" + previous_version.full_version) + if previous_version.upstream_version == changelog.upstream_version \ + and upload == "ubuntu": + cmd.append("-sd") else: - cmd.append("-v" + task.get_version().full_version) + cmd.append("-sa") if not keyid is None: cmd += ["-k" + keyid] Print.command(cmd)