Merge the requestsync fix from Iain Lane (~laney/ubuntu-dev-tools/dev).

This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-07-03 19:26:25 +02:00
parent 3d28d36c9f
commit dca732d355
2 changed files with 7 additions and 5 deletions

6
debian/changelog vendored
View File

@ -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 <kees@ubuntu.com> Fri, 13 Jun 2008 11:55:24 -0700
-- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Thu, 03 Jul 2008 19:24:46 +0200
ubuntu-dev-tools (0.31) intrepid; urgency=low

View File

@ -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.'