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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 0b0be298d04c13e3de019a51295c815b332cc8cf
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Oct 4 21:19:44 2011 +0200

    don't add the bug report guidance template if the package is a special one (like wnpp, ftp.d.o and release.d.o); thanks to Arno Töll for the report; Closes: #643785

diff --git a/debian/changelog b/debian/changelog
index b57963d..64c024a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,12 @@ reportbug (6.2.2) UNRELEASED; urgency=low
     - fix a crash when using -N nnnnnn and at the last menu answer 'Show other
       bug reports (return to bug listing).'; thanks to Ritesh Raj Sarraf for the
       report; Closes: #642939
+  * reportbug/bugreport.py
+    - don't add the bug report guidance template if the package is a special one
+      (like wnpp, ftp.d.o and release.d.o); thanks to Arno Töll for the report;
+      Closes: #643785
 
- -- Sandro Tosi <morph at debian.org>  Tue, 04 Oct 2011 21:01:19 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 04 Oct 2011 21:16:18 +0200
 
 reportbug (6.2.1) unstable; urgency=low
 
diff --git a/reportbug/bugreport.py b/reportbug/bugreport.py
index a1f31f5..2603087 100644
--- a/reportbug/bugreport.py
+++ b/reportbug/bugreport.py
@@ -110,7 +110,12 @@ class bugreport(object):
 
         body = getattr(self, 'body', u'')
         body = body.decode('utf8')
-        if self.mode < utils.MODE_ADVANCED:
+
+        # add NEWBIELINE only if it's less than advanced and the package is not
+        # one of the specials (f.e. those with a dedicated function) also
+        # thinking about those systems that don't have 'specials' dict
+        if self.mode < utils.MODE_ADVANCED and self.package not in \
+                debbugs.SYSTEMS[self.system].get('specials', {}).keys():
             body = utils.NEWBIELINE+u'\n\n'+body
         elif not body:
             body = u'\n'

-- 
Reportbug - reports bugs in the Debian distribution