[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-116-g3599332

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 17f57980839ff935522ada15f4f861e82838b9f9
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jul 30 18:52:45 2012 +0200

    remove 'freeze-exception' option for release.d.o package; thanks to Niels Thykier for the report; Closes: #683272

diff --git a/debian/changelog b/debian/changelog
index 325e77c..b1d7fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (6.4.2) UNRELEASED; urgency=low
+
+  * reportbug/debbugs.py
+    - remove 'freeze-exception' option for release.d.o package; thanks to Niels
+      Thykier for the report; Closes: #683272
+
+ -- Sandro Tosi <morph at debian.org>  Mon, 30 Jul 2012 18:51:49 +0200
+
 reportbug (6.4.1) unstable; urgency=low
 
   * bin/reportbug
diff --git a/reportbug/debbugs.py b/reportbug/debbugs.py
index 4b9e4d3..85cdecc 100644
--- a/reportbug/debbugs.py
+++ b/reportbug/debbugs.py
@@ -401,7 +401,6 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
         'britney':          "testing migration script bugs",
         'transition':       "transition tracking",
         'unblock':          "unblock requests",
-        'freeze-exception': "Freeze exceptions",
         'opu':              "oldstable proposed updates requests",
         'pu':               "stable proposed updates requests",
         'rm':               "Stable/Testing removal requests",
@@ -448,7 +447,7 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
         else:
             package = info[12] or package
 
-    if tag in ('binnmu', 'unblock', 'freeze-exception', 'opu', 'pu', 'rm'):
+    if tag in ('binnmu', 'unblock', 'opu', 'pu', 'rm'):
         # FIXME: opu/pu/rm should lookup the version elsewhere
         version = info and info[0]
         if online:
@@ -548,7 +547,7 @@ def handle_debian_release(package, bts, ui, fromaddr, timeout, online=True, http
     elif tag == 'britney':
         subject = subject_britney
         body = ''
-    elif tag == 'unblock' or tag == 'freeze-exception':
+    elif tag == 'unblock':
         subject = 'unblock: %s/%s' % (package, version)
         body    = textwrap.dedent(u"""\
                 Please unblock package %s

-- 
Reportbug - reports bugs in the Debian distribution