mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-10 08:21:29 +00:00
sponsor-patch: Make sure that the source tarball is uploaded if it's not in the archive.
This commit is contained in:
parent
8902b0571a
commit
70369b4fa0
@ -71,6 +71,13 @@ class BugTask(object):
|
|||||||
result += " (" + self.series + ")"
|
result += " (" + self.series + ")"
|
||||||
return result
|
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):
|
def get_series(self, latest_release=False):
|
||||||
if self.series is None or latest_release:
|
if self.series is None or latest_release:
|
||||||
return self.launchpad.distributions[self.project].current_series.name
|
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
|
# Build source package
|
||||||
cmd = ["debuild", "--no-lintian", "-S"]
|
cmd = ["debuild", "--no-lintian", "-S"]
|
||||||
if task.is_merge():
|
previous_version = task.get_previous_version()
|
||||||
ubuntu_version = task.get_latest_released_version()
|
cmd.append("-v" + previous_version.full_version)
|
||||||
cmd.append("-v" + ubuntu_version.full_version)
|
if previous_version.upstream_version == changelog.upstream_version \
|
||||||
if ubuntu_version.upstream_version == changelog.upstream_version \
|
and upload == "ubuntu":
|
||||||
and upload == "ubuntu":
|
cmd.append("-sd")
|
||||||
cmd.append("-sd")
|
|
||||||
else:
|
|
||||||
cmd.append("-sa")
|
|
||||||
else:
|
else:
|
||||||
cmd.append("-v" + task.get_version().full_version)
|
cmd.append("-sa")
|
||||||
if not keyid is None:
|
if not keyid is None:
|
||||||
cmd += ["-k" + keyid]
|
cmd += ["-k" + keyid]
|
||||||
Print.command(cmd)
|
Print.command(cmd)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user