--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package reportbug
It includes very small fixes for crashes or inconsistent behaviors.
unblock reportbug/6.4.3
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/bin/reportbug b/bin/reportbug
index ca0b501..774eaad 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -406,6 +406,9 @@ def find_package_for(filename, notatty=False, pathonly=False):
package = ui.menu("Multiple packages match: ", packs, 'Select one '
'of these packages: ', any_ok=True)
+ # for urwid, when pressing 'Cancel' in the menu
+ if package == -1:
+ package = None
return (filename, package)
else:
package = packages.keys()[0]
diff --git a/debian/changelog b/debian/changelog
index d379352..3121c51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+reportbug (6.4.3) unstable; urgency=low
+
+ * reportbug/debbugs.py
+ - add a note to include/attach the debdiff in case of unblocks for
+ release.d.o; thanks to Ulrich Dangel for the report and to Niels Thykier
+ for ack'ing it on IRC; Closes: #681206
+ * reportbug/utils.py
+ - recognize Control as a pseudo-header; thanks to Paul Wise for the report;
+ Closes: #684540
+ * reportbug/ui/urwid_ui.py
+ - fix a crash when selecting 'Quit' in the Urwid UI window presenting the
+ list of bugs already filed; thanks to Ryan Kavanagh for the report;
+ Closes: #668395
+ * bin/reportbug
+ - in Urwid UI, when cancelling on the list of packages matching the input
+ package, don't present '-1' as resulting package, but that nothing was
+ selected; thanks to Valentin Lorentz for the report; Closes: #667663
+
+ -- Sandro Tosi <morph@debian.org> Sat, 18 Aug 2012 22:49:44 +0200
+
reportbug (6.4.2) unstable; urgency=low
* reportbug/debbugs.py
diff --git a/reportbug/__init__.py b/reportbug/__init__.py
index 6cb63de..f9d335e 100644
--- a/reportbug/__init__.py
+++ b/reportbug/__init__.py
@@ -25,7 +25,7 @@ SOFTWARE."""
__all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions',
'debbugs', 'exceptions', 'submit', 'tempfile']
-VERSION_NUMBER = "6.4.2"
+VERSION_NUMBER = "6.4.3"
VERSION = "reportbug "+VERSION_NUMBER
COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence <lawrencc@debian.org>' + \
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index 85cdecc..257ab10 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -554,6 +554,8 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
(explain the reason for the unblock here)
+ (include/attach the debdiff against the package in testing)
+
unblock %s/%s
""" % (package, package, version))
elif tag == 'pu' or tag == 'opu':
diff --git a/reportbug/ui/urwid_ui.py b/reportbug/ui/urwid_ui.py
index 4c33a7f..e85f8ae 100644
--- a/reportbug/ui/urwid_ui.py
+++ b/reportbug/ui/urwid_ui.py
@@ -609,6 +609,9 @@ def handle_bts_query(package, bts, timeout, mirrors=None, http_proxy="",
if info < 0:
if info == -1:
result = None
+ # -2 is the Quit response, triggers the exiting way in main
+ elif info == -2:
+ raise NoReport
else:
# uniform to return Bugreport instance
result = debbugs.get_report(info, timeout)[0]
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 94ff1cd..01f7062 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -50,7 +50,7 @@ STATUSDB = os.path.join(DPKGLIB, 'status')
# Headers other than these become email headers for debbugs servers
PSEUDOHEADERS = ('Package', 'Source', 'Version', 'Severity', 'File', 'Tags',
'Justification', 'Followup-For', 'Owner', 'User', 'Usertags',
- 'Forwarded')
+ 'Forwarded', 'Control')
MODES = {'novice': 'Offer simple prompts, bypassing technical questions.',
'standard': 'Offer more extensive prompts, including asking about '
--- End Message ---