[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.6-17-gcdad7ce

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 3ae9e9c6aed2fb01dc3eee6554c3bfe029c3389f
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Sep 2 22:49:41 2009 +0200

    added 'britney' tag support + fixes username of usertags

diff --git a/reportbug/debianbts.py b/reportbug/debianbts.py
index 25de917..152aff6 100644
--- a/reportbug/debianbts.py
+++ b/reportbug/debianbts.py
@@ -330,6 +330,7 @@ def handle_debian_release(package, bts, ui, fromaddr, online=True, http_proxy=No
                   'a bug in an existing package, please press Enter to '
                   'exit reportbug.)', {
         'binnmu':           "binNMU requests",
+        'britney':          "testing migration script bugs",
         'transition':       "transition tracking",
         'unblock':          "unblock requests",
         'freeze-exception': "Freeze exceptions",
@@ -346,31 +347,38 @@ def handle_debian_release(package, bts, ui, fromaddr, online=True, http_proxy=No
     if tag == 'other':
         return
 
-    prompt  = 'Please enter the name of the package: '
-    package = ui.get_string(prompt)
-    if not package:
-        ui.log_message('You seem to want to report a generic bug, not request a removal\n')
-        return
-
-    ui.log_message('Checking status database...\n')
-    info = utils.get_package_status(package)
-    available = info[1]
-
-    query = False
-    if not available:
-        info = utils.get_source_package(package)
-        if info:
-            info = utils.get_package_status(info[0][0])
-
-    if not info:
-        cont = ui.select_options(
-            "This package doesn't appear to exist; continue?",
-            'yN', {'y': 'Ignore this problem and continue.',
-                   'n': 'Exit without filing a report.' })
-        if cont == 'n':
+    if tag == 'britney':
+        subject_britney = ui.get_string('Please enter the subject of the bug report: ')
+        if not subject_britney:
+            ui.long_message('No subject specified, exiting')
             sys.exit(1)
     else:
-        package = info[12] or package
+        # package checks code
+        prompt  = 'Please enter the name of the package: '
+        package = ui.get_string(prompt)
+        if not package:
+            ui.log_message('You seem to want to report a generic bug, not request a removal\n')
+            return
+
+        ui.log_message('Checking status database...\n')
+        info = utils.get_package_status(package)
+        available = info[1]
+
+        query = False
+        if not available:
+            info = utils.get_source_package(package)
+            if info:
+                info = utils.get_package_status(info[0][0])
+
+        if not info:
+            cont = ui.select_options(
+                "This package doesn't appear to exist; continue?",
+                'yN', {'y': 'Ignore this problem and continue.',
+                       'n': 'Exit without filing a report.' })
+            if cont == 'n':
+                sys.exit(1)
+        else:
+            package = info[12] or package
 
     if tag in ('binnmu', 'unblock', 'freeze-exceptions', 'opu', 'pu', 'rm'):
         # FIXME: opu/pu/rm should lookup the version elsewhere
@@ -400,7 +408,7 @@ def handle_debian_release(package, bts, ui, fromaddr, online=True, http_proxy=No
                 ui.long_message('Partial removal requests must have a list of architectures.\n')
                 raise SystemExit
 
-    pseudos.append("User: debian-release at lists.debian.org")
+    pseudos.append("User: release.debian.org at packages.debian.org")
     pseudos.append("Usertags: %s" % (tag))
 
     if tag == 'binnmu':
@@ -410,6 +418,9 @@ def handle_debian_release(package, bts, ui, fromaddr, online=True, http_proxy=No
     elif tag == 'transition':
         subject = 'transition: %s' % (package)
         body    = '(please explain about the transition: impacted packages, reason, ...)\n'
+    elif tag == 'britney':
+        subject = subject_britney
+        body = ''
     elif tag == 'unblock' or tag == 'freeze-exception':
         subject = 'unblock: %s/%s' % (package, version)
         body    = textwrap.dedent(u"""\

-- 
Reportbug - reports bugs in the Debian distribution