From bf5de3c68639cd8d6e6047660b4a901eee8944af Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Wed, 12 Oct 2011 00:51:59 +0200 Subject: [PATCH] syncpackage: Allow syncing to -proposed with --no-lp. --- debian/changelog | 6 +++++- syncpackage | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 976c9f1..6f41648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ ubuntu-dev-tools (0.133) UNRELEASED; urgency=low + [ Stefano Rivera ] * mk-sbuild: Only grant access to the admin group when it exists (Closes: #642824) - -- Stefano Rivera Sun, 25 Sep 2011 16:00:57 +0200 + [ Benjamin Drung ] + * syncpackage: Allow syncing to -proposed with --no-lp. + + -- Benjamin Drung Wed, 12 Oct 2011 00:51:06 +0200 ubuntu-dev-tools (0.132) unstable; urgency=low diff --git a/syncpackage b/syncpackage index a57a891..2ab5897 100755 --- a/syncpackage +++ b/syncpackage @@ -125,7 +125,7 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror, new_ver = Version(src_pkg.dsc["Version"]) try: - ubuntu_source = get_ubuntu_srcpkg(src_pkg.source, release) + ubuntu_source = get_ubuntu_srcpkg(src_pkg.source, release.split("-")[0]) ubuntu_ver = Version(ubuntu_source.getVersion()) ubu_pkg = UbuntuSourcePackage(src_pkg.source, ubuntu_ver.full_version, ubuntu_source.getComponent(), @@ -587,7 +587,7 @@ def main(): options.release = ubuntu.current_series.name src_pkg = fetch_source_pkg(args[0], options.dist, options.debversion, - options.component, options.release, + options.component, options.release.split("-")[0], options.debian_mirror) blacklisted, comments = is_blacklisted(src_pkg.source)