[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 66dbc60ebbfa9f0b2c84815621b72628b739bcfa
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Apr 6 22:05:25 2010 +0200

    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

diff --git a/bin/reportbug b/bin/reportbug
index 79e28b3..7ea1c97 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -934,6 +934,9 @@ def main():
     parser.add_option('--no-paranoid', action='store_false', dest='paranoid',
                       help='don\'t show contents of message before sending '
                       '(default)')
+    parser.add_option('--no-bug-script', dest="bugscript", default=True,
+                      action='store_false',
+                      help='don\'t execute the bug script (if present)')
     parser.add_option('--draftpath', dest="draftpath",
                       help='Save the draft in this directory')
     parser.add_option('--timeout', type="int", dest='timeout', default=60,
@@ -1906,7 +1909,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
             tags = ''
 
         # Execute bug script
-        if (interactive or self.options.template) and bugexec and not self.options.kudos:
+        if self.options.bugscript and bugexec and not self.options.kudos:
             if os.path.exists('handle_bugscript'):
                 handler = './handle_bugscript'
             else:
diff --git a/debian/changelog b/debian/changelog
index dcb3450..597d579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,13 +49,16 @@ reportbug (4.12) UNRELEASED; urgency=low
     - added the '--from-buildd $SRC_$VER' option to make reportbug file the bug
       against the source package $SRC for the given $VER version; thanks to
       Cyril Brulebois for the report; Closes: #571970
+    - 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
   * 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 11:09:14 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 06 Apr 2010 21:58:31 +0200
 
 reportbug (4.11) unstable; urgency=low
 
diff --git a/man/reportbug.1 b/man/reportbug.1
index dc9249e..047ec3d 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -269,6 +269,11 @@ to edit and send it.
 Run \fBreportbug\fP against the specified bug report, useful when
 following-up a bug and its number is already known.
 .TP
+.B \-\-no\-bug\-script
+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 \-o FILE, \-\-output=FILE
 Instead of sending an email, redirect it to the specified filename.
 

-- 
Reportbug - reports bugs in the Debian distribution