diff -Nru ubuntu-dev-tools-0.132ubuntu0.1/debian/changelog ubuntu-dev-tools-0.132ubuntu0.2/debian/changelog --- ubuntu-dev-tools-0.132ubuntu0.1/debian/changelog 2011-10-17 16:37:25.000000000 +0200 +++ ubuntu-dev-tools-0.132ubuntu0.2/debian/changelog 2011-10-23 21:07:40.000000000 +0200 @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.132ubuntu0.2) oneiric-proposed; urgency=low + + * syncpackage: Gracefully deal with no available changelog from Debian (PTS + changelogs aren't available immediately) (LP: #880051) + + -- Stefano Rivera Sun, 23 Oct 2011 21:06:41 +0200 + ubuntu-dev-tools (0.132ubuntu0.1) oneiric-proposed; urgency=low * syncpackage, requestsync: Default to syncing from testing (LP: #876400) diff -Nru ubuntu-dev-tools-0.132ubuntu0.1/syncpackage ubuntu-dev-tools-0.132ubuntu0.2/syncpackage --- ubuntu-dev-tools-0.132ubuntu0.1/syncpackage 2011-10-17 16:32:43.000000000 +0200 +++ ubuntu-dev-tools-0.132ubuntu0.2/syncpackage 2011-10-23 21:06:32.000000000 +0200 @@ -365,8 +365,9 @@ src_pkg.source, ubuntu_series, ubuntu_pocket, src_pkg.version) - changes = get_debian_changelog(debian_spph, base_version).strip() + changes = get_debian_changelog(debian_spph, base_version) if changes: + changes = changes.strip() Logger.normal("New changes:\n%s", changes) if simulate: @@ -446,8 +447,9 @@ """Close the correct task on all bugs, with changes""" ubuntu = Launchpad.distributions['ubuntu'] message = ("This bug was fixed in the package %s - %s" - "\n\n---------------\n%s" % ( - package, version, changes)) + % (package, version)) + if changes: + message += "\n\n---------------\n" + changes for bug in bugs: bug = Launchpad.bugs[bug] if bug.duplicate_of is not None: