From 61322084e69f8ffe2a3c2673f2e70aa99dd14a98 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 6 May 2008 12:21:09 +0100 Subject: [PATCH 1/3] fix bug closure --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 63c786c..073eb39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ ubuntu-dev-tools (0.31) UNRELEASED; urgency=low * requestsync: - Use debian_bundle.changelog.Version for version comparison in debian_changelog. - - Fix --lp for Firefox 3 (LP: 208808): + - Fix --lp for Firefox 3 (LP: #208808): It now tries ~/.lpcookie.txt, ~/.mozilla/*/*/cookies.sqlite and ~/.mozilla/*/*/cookies.txt to find a Launchpad cookie file. Also added a hint that you can create a valid file, by logging into From 3bf7f10b537b7814a4f48a2d3bbf444de364ba70 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 14 May 2008 20:16:05 +0100 Subject: [PATCH 2/3] Fix bug in requestsync causing corruption when bug text was edited for a second or subsequent time. Tuple returned by edit_report was not being unpacked as it needed to be. --- requestsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requestsync b/requestsync index e489470..1ff15af 100755 --- a/requestsync +++ b/requestsync @@ -418,21 +418,21 @@ if __name__ == '__main__': report += debian_changelog(srcpkg, debiancomponent, base_ver) + '\n' if need_interaction: - report = edit_report(title, report, changes_required=True) + (_, bug_text) = 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, report): + if post_bug(srcpkg, subscribe, mapping[status], title, bug_text): 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, report, keyid): + if mail_bug(srcpkg, subscribe, status, title, bug_text, keyid): sys.exit(0) print 'Something went wrong. No sync request filed.' From 07dd830414aa8986f4d00a0835db57f936dd9e97 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Fri, 16 May 2008 19:51:45 +0100 Subject: [PATCH 3/3] Fix bug in pbuilder-dist whereby the error message with invalid distribution names (not alpha) printed "%s" instead of the name. --- pbuilder-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pbuilder-dist b/pbuilder-dist index 9790f87..230cc80 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -128,7 +128,7 @@ class pbuilder_dist: """ if not distro.isalpha(): - print 'Error: «%s» is an invalid distribution codename.' + print 'Error: «%s» is an invalid distribution codename.' % distro sys.exit(1) if not os.path.isfile(os.path.join('/usr/share/debootstrap/scripts/', distro)):