From dca732d355742af781a6d33a9b1c3f1e9b91e6c4 Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Thu, 3 Jul 2008 19:26:25 +0200 Subject: [PATCH] Merge the requestsync fix from Iain Lane (~laney/ubuntu-dev-tools/dev). --- debian/changelog | 6 ++++-- requestsync | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69601a2..756254a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ubuntu-dev-tools (0.32) UNRELEASED; urgency=low - * [empty changelog for new bzr commits] + [ Iain Lane ] + * requestsync: Fix bug where requestsync would fall over when requesting + sync for package with no local changes. - -- Kees Cook Fri, 13 Jun 2008 11:55:24 -0700 + -- Siegfried-Angel Gevatter Pujals (RainCT) Thu, 03 Jul 2008 19:24:46 +0200 ubuntu-dev-tools (0.31) intrepid; urgency=low diff --git a/requestsync b/requestsync index 4b9f6a0..41f8ff4 100755 --- a/requestsync +++ b/requestsync @@ -419,21 +419,21 @@ if __name__ == '__main__': report += debian_changelog(srcpkg, debiancomponent, base_ver) + '\n' if need_interaction: - (_, bug_text) = edit_report(title, report, changes_required=True) + (_, report) = edit_report(title, report, changes_required=True) # Post sync request using Launchpad interface: srcpkg = not newsource and srcpkg or None if use_lp_bugs: # Map status to the values expected by lp-bugs mapping = {'new': 'New', 'confirmed': 'Confirmed'} - if post_bug(srcpkg, subscribe, mapping[status], title, bug_text): + if post_bug(srcpkg, subscribe, mapping[status], title, report): sys.exit(0) # Abort on error: print 'Something went wrong. No sync request filed.' sys.exit(1) # Mail sync request: - if mail_bug(srcpkg, subscribe, status, title, bug_text, keyid): + if mail_bug(srcpkg, subscribe, status, title, report, keyid): sys.exit(0) print 'Something went wrong. No sync request filed.'