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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit c813aac216972b6d6c372b02db940e870fffc8df
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Jun 16 20:13:45 2010 +0200

    fix the crash when asking for tags menu after editing of bug body; thanks to Christoph Anton Mitterer for the report; Closes: #586044
    
    Since get_tags() now requires the 'mode' value to return the correct tags list
    for the current mode, we need to pass 'mode' to handle_editing too, so that we
    can call get_tags inside it and pass mode along the path

diff --git a/bin/reportbug b/bin/reportbug
index b11a78a..509623f 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -152,7 +152,7 @@ def include_file_in_report(message, message_filename,
 # Useful to retrieve CCs given in handle_editing
 CCS = []
 def handle_editing(filename, dmessage, options, sendto, attachments, package,
-                   severity, editor=None, charset='utf-8', tags=''):
+                   severity, mode, editor=None, charset='utf-8', tags=''):
     if not editor:
         editor = options.editor
     editor = utils.which_editor(editor)
@@ -2014,7 +2014,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
             if not self.options.body and not self.options.bodyfile:
                 message, haspatch = handle_editing(filename, message, self.options,
                                          sendto, attachments, package,
-                                         severity, charset=charset, tags=tags)
+                                         severity, mode, charset=charset, tags=tags)
                 if haspatch:
                     patch = True
 
diff --git a/debian/changelog b/debian/changelog
index cd94284..85b7b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ reportbug (4.12.4) UNRELEASED; urgency=low
   * man/reportbug.1
     - fixed documentation for '--no-tags-menu', wrongly associated to
       '--no-bug-script'; thanks to Jakub Wilk for the report; Closes: #584964
+  * bin/reportbug
+    - fix the crash when asking for tags menu after editing of bug body; thanks
+      to Christoph Anton Mitterer for the report; Closes: #586044
 
- -- Sandro Tosi <morph at debian.org>  Mon, 07 Jun 2010 23:14:55 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 16 Jun 2010 20:07:08 +0200
 
 reportbug (4.12.3) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution