Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-04-19 22:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with Iain Lane's branch.

Browse Source
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-05-22 16:50:05 +02:00
commit 2f90a21dd5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

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

2
pbuilder-dist
View File

@ -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)):

18
requestsync
View File

@ -1,14 +1,14 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# (C) 2007 Canonical Ltd., Steve Kowalik
# Authors:
# Martin Pitt <martin.pitt@ubuntu.com>
# Steve Kowalik <stevenk@ubuntu.com>
# Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support)
# Daniel Hahler <ubuntu@thequod.de>
# Martin Pitt <martin.pitt@ubuntu.com>
# Steve Kowalik <stevenk@ubuntu.com>
# Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support)
# Daniel Hahler <ubuntu@thequod.de>
#
# 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.'