Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-06-08 22:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

syncpackage: Don't throw away release pockets, returning correct errors

Browse Source 
when the source and destination match even though the destination release
pocket doesn't.
This commit is contained in:
Stefano Rivera 2012-10-30 09:41:56 +01:00
parent d826cd20e0
commit 87d76c813a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
ubuntu-dev-tools (0.145) UNRELEASED; urgency=low
* syncpackage: Don't throw away release pockets, returning correct errors
when the source and destination match even though the destination release
pocket doesn't.
-- Stefano Rivera <stefanor@debian.org> Tue, 30 Oct 2012 09:40:08 +0100
ubuntu-dev-tools (0.144) experimental; urgency=low ubuntu-dev-tools (0.144) experimental; urgency=low
[ Stefano Rivera ] [ Stefano Rivera ]

11
syncpackage
View File

@ -134,8 +134,9 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror,
new_ver = Version(src_pkg.dsc["Version"]) new_ver = Version(src_pkg.dsc["Version"])
try: try:
series = release.split("-")[0] ubuntu_series, ubuntu_pocket = split_release_pocket(release)
ubuntu_source = get_ubuntu_srcpkg(src_pkg.source, series) ubuntu_source = get_ubuntu_srcpkg(src_pkg.source, ubuntu_series,
ubuntu_pocket)
ubuntu_ver = Version(ubuntu_source.getVersion()) ubuntu_ver = Version(ubuntu_source.getVersion())
ubu_pkg = UbuntuSourcePackage(src_pkg.source, ubuntu_ver.full_version, ubu_pkg = UbuntuSourcePackage(src_pkg.source, ubuntu_ver.full_version,
ubuntu_source.getComponent(), ubuntu_source.getComponent(),
@ -317,7 +318,9 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release,
if version is None: if version is None:
version = Version(debian_srcpkg.getVersion()) version = Version(debian_srcpkg.getVersion())
try: try:
ubuntu_srcpkg = get_ubuntu_srcpkg(package, ubuntu_release) ubuntu_series, ubuntu_pocket = split_release_pocket(ubuntu_release)
ubuntu_srcpkg = get_ubuntu_srcpkg(package, ubuntu_series,
ubuntu_pocket)
ubuntu_version = Version(ubuntu_srcpkg.getVersion()) ubuntu_version = Version(ubuntu_srcpkg.getVersion())
except udtexceptions.PackageNotFoundException: except udtexceptions.PackageNotFoundException:
ubuntu_version = Version('~') ubuntu_version = Version('~')
@ -692,7 +695,7 @@ def main():
src_pkg = fetch_source_pkg(package, options.distribution, src_pkg = fetch_source_pkg(package, options.distribution,
options.debian_version, options.debian_version,
options.component, options.component,
options.release.split("-")[0], options.release,
options.debian_mirror) options.debian_mirror)
blacklisted, comments = is_blacklisted(src_pkg.source) blacklisted, comments = is_blacklisted(src_pkg.source)