mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-17 11:51:29 +00:00
Support syncs from a non-default series (LP: #931644)
This commit is contained in:
parent
aafcbd082e
commit
948032d8a3
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -6,6 +6,7 @@ ubuntu-dev-tools (0.139) UNRELEASED; urgency=low
|
|||||||
* sponsor-patch:
|
* sponsor-patch:
|
||||||
- Determine the task from the UDD branch.
|
- Determine the task from the UDD branch.
|
||||||
- Support syncs of new packages.
|
- Support syncs of new packages.
|
||||||
|
- Support syncs from a non-default series (LP: #931644)
|
||||||
* Re-add dgetlp. Still needed for downloading source packages from +queue.
|
* Re-add dgetlp. Still needed for downloading source packages from +queue.
|
||||||
(LP: #919805)
|
(LP: #919805)
|
||||||
* pbuilder-dist: Export DISTRIBUTION and ARCHITECTURE as well as DIST and
|
* pbuilder-dist: Export DISTRIBUTION and ARCHITECTURE as well as DIST and
|
||||||
|
@ -125,13 +125,7 @@ class BugTask(object):
|
|||||||
|
|
||||||
if self.is_derived_from_debian() and not latest_release:
|
if self.is_derived_from_debian() and not latest_release:
|
||||||
project = "debian"
|
project = "debian"
|
||||||
title = self.bug_task.bug.title.lower().split()
|
series = self.get_debian_source_series()
|
||||||
if "experimental" in title:
|
|
||||||
series = "experimental"
|
|
||||||
elif "testing" in title:
|
|
||||||
series = distro_info.DebianDistroInfo().testing()
|
|
||||||
else:
|
|
||||||
series = distro_info.DebianDistroInfo().devel()
|
|
||||||
else:
|
else:
|
||||||
project = self.project
|
project = self.project
|
||||||
series = self.get_series(latest_release)
|
series = self.get_series(latest_release)
|
||||||
@ -163,6 +157,16 @@ class BugTask(object):
|
|||||||
version = source.source_package_version
|
version = source.source_package_version
|
||||||
return debian.debian_support.Version(version)
|
return debian.debian_support.Version(version)
|
||||||
|
|
||||||
|
def get_debian_source_series(self):
|
||||||
|
title = self.bug_task.bug.title.lower().split()
|
||||||
|
if "experimental" in title:
|
||||||
|
series = "experimental"
|
||||||
|
elif "testing" in title:
|
||||||
|
series = distro_info.DebianDistroInfo().testing()
|
||||||
|
else:
|
||||||
|
series = distro_info.DebianDistroInfo().devel()
|
||||||
|
return series
|
||||||
|
|
||||||
def is_complete(self):
|
def is_complete(self):
|
||||||
return self.bug_task.is_complete
|
return self.bug_task.is_complete
|
||||||
|
|
||||||
|
@ -440,12 +440,13 @@ class SourcePackage(object):
|
|||||||
|
|
||||||
return lintian_filename
|
return lintian_filename
|
||||||
|
|
||||||
def sync(self, upload, bug_number, requester):
|
def sync(self, upload, series, bug_number, requester):
|
||||||
"""Does a sync of the source package."""
|
"""Does a sync of the source package."""
|
||||||
|
|
||||||
if upload == "ubuntu":
|
if upload == "ubuntu":
|
||||||
cmd = ["syncpackage", self._package, "-b", str(bug_number), "-f",
|
cmd = ["syncpackage", self._package, "-b", str(bug_number), "-f",
|
||||||
"-s", requester, "-V", str(self._version)]
|
"-s", requester, "-V", str(self._version),
|
||||||
|
"-d", series]
|
||||||
Logger.command(cmd)
|
Logger.command(cmd)
|
||||||
if subprocess.call(cmd) != 0:
|
if subprocess.call(cmd) != 0:
|
||||||
Logger.error("Syncing of %s %s failed.", self._package,
|
Logger.error("Syncing of %s %s failed.", self._package,
|
||||||
|
@ -286,7 +286,8 @@ def sponsor_patch(bug_number, build, builder, edit, keyid, lpinstance, update,
|
|||||||
previous_version)
|
previous_version)
|
||||||
|
|
||||||
if successful:
|
if successful:
|
||||||
if source_package.sync(upload, bug_number, bug.owner.name):
|
series = task.get_debian_source_series()
|
||||||
|
if source_package.sync(upload, series, bug_number, bug.owner.name):
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
edit = True
|
edit = True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user