[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-92-gdd39129

[Sandro Tosi]

The following commit has been merged in the master branch:
commit dd391290a3b01caf593d80641adb94c2368b3e8c
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Apr 6 23:47:52 2010 +0200

    added the '--no-cc-menu' and '--no-tags-menu' command-line options to suppress
    CC and tags menus
    
      - added the '--no-cc-menu' command-line option to not display the menu
        asking for additional CCs; part of #428113
      - added the '--no-tags-menu' command-line option to not display the menu
        asking for tags; thanks to Josh Triplett for the report and Carl Chenet
        for the (partial) patch; Closes: #428113

diff --git a/bin/reportbug b/bin/reportbug
index 7ea1c97..09ea1da 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -941,6 +941,12 @@ def main():
                       help='Save the draft in this directory')
     parser.add_option('--timeout', type="int", dest='timeout', default=60,
                       help='Specify the network timeout, in seconds [default: %default]')
+    parser.add_option('--no-cc-menu', dest="ccmenu", default=True,
+                      action='store_false',
+                      help='don\'t show additional CC menu')
+    parser.add_option('--no-tags-menu', dest="tagsmenu", default=True,
+                      action='store_false',
+                      help='don\'t show tags menu')
 
     (options, args) = parser.parse_args()
 
@@ -1798,7 +1804,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
         if not listcc:
             listcc = []
 
-        if not listcc and mode > MODE_STANDARD and rtype == 'debbugs' and not self.options.testmode and not self.options.template:
+        if not listcc and mode > MODE_STANDARD and rtype == 'debbugs' and not self.options.testmode and not self.options.template and self.options.ccmenu:
             listcc += ui.get_multiline('Enter any additional addresses this report should be sent to; press ENTER after each address.')
 
         if severity and rtype:
@@ -1889,7 +1895,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
         if (rtype == 'debbugs' and not self.options.tags and
             not (notatty or self.options.kudos or exinfo) and
             package not in ('wnpp', 'ftp.debian.org', 'release.debian.org') and
-            mode > MODE_NOVICE):
+            mode > MODE_NOVICE and self.options.tagsmenu):
             tags = debianbts.get_tags(severity)
 
             taglist = ui.select_multiple(
diff --git a/debian/changelog b/debian/changelog
index 597d579..1334995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,13 +52,18 @@ reportbug (4.12) UNRELEASED; urgency=low
     - added the '--no-bug-script' command-line option to not execute the bug
       script; thanks to Håkon Stordahl for the report and the (inspiring) patch;
       Closes: #511210
+    - added the '--no-cc-menu' command-line option to not display the menu
+      asking for additional CCs; part of #428113
+    - added the '--no-tags-menu' command-line option to not display the menu 
+      asking for tags; thanks to Josh Triplett for the report and Carl Chenet
+      for the (partial) patch; Closes: #428113
   * bin/reportbug, reportbug/ui/text_ui.py, share/presubj
     - append a notice to every 'presubj' script shown in UI text that 'q' is
       probably the key to press to exit the pager (updating reportbug 'presubj'
       script to remove that notice); thanks to Chris Walker for the report;
       Closes: #488414
 
- -- Sandro Tosi <morph at debian.org>  Tue, 06 Apr 2010 21:58:31 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 06 Apr 2010 23:44:58 +0200
 
 reportbug (4.11) unstable; urgency=low
 
diff --git a/man/reportbug.1 b/man/reportbug.1
index 047ec3d..9c081a1 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -274,6 +274,12 @@ Do not execute the bug script (if present); this option can be useful
 together with \-\-template to suppress every interactive actions,
 since some bug scripts can ask questions.
 .TP
+.B \-\-no\-cc\-menu
+Don't display the menu to enter additional addresses (CC).
+.TP
+.B \-\-no\-bug\-script
+Don't display the menu to enter additional tags.
+.TP
 .B \-o FILE, \-\-output=FILE
 Instead of sending an email, redirect it to the specified filename.
 

-- 
Reportbug - reports bugs in the Debian distribution