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 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)): diff --git a/requestsync b/requestsync index e489470..727ccbb 100755 --- a/requestsync +++ b/requestsync @@ -1,14 +1,14 @@ #!/usr/bin/python # -*- coding: utf-8 -*- - +# # (C) 2007 Canonical Ltd., Steve Kowalik # Authors: -# Martin Pitt -# Steve Kowalik -# Michael Bienia (python-launchpad-bugs support) -# Daniel Hahler +# Martin Pitt +# Steve Kowalik +# Michael Bienia (python-launchpad-bugs support) +# Daniel Hahler # -# License: GPLv2, see /usr/share/common-licenses/GPL +# License: GPLv2, see /usr/share/common-licenses/GPL-2 import os, sys, urllib, subprocess, getopt from debian_bundle.changelog import Version @@ -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.'