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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit feebe33fc255bfc6e8c3e46665dba0777c8bcd84
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 5 17:32:03 2011 +0100

    improved check for package name in the subject, now checking if the it's at the beginning of the subject, and even if provided via '--subject' cli option; thanks to Cyril Brulebois for noticing it; Closes: #579596

diff --git a/bin/reportbug b/bin/reportbug
index 4ba955d..caa5d3d 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1884,11 +1884,12 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                 'Your description is a bit long; please enter a shorter subject. '
                 '(An empty response will retain the existing subject.)',
                 empty_ok=True, force_prompt=True) or subject
-        if package != 'wnpp' and prompted and mode < MODE_EXPERT:
+        if package != 'wnpp' and mode < MODE_EXPERT:
             if foundfile:
                 subject = foundfile + ": " + subject
                 ewrite("Rewriting subject to '%s'\n", subject)
-            elif (not re.match(r"\S+:\s", subject) and package not in subject):
+            elif (not re.match(r"\S+:\s", subject) and
+                  not subject.startswith(package)):
                 subject = package + ": " + subject
                 ewrite("Rewriting subject to '%s'\n", subject)
 
diff --git a/debian/changelog b/debian/changelog
index eba412b..b82396a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ reportbug (6.3) UNRELEASED; urgency=low
       source package (either by using --src cli option or by selecting the
       source pkg in the menu); thanks to Julian Andres Klode for the report;
       Closes: #644194
+    - improved check for package name in the subject, now checking if the
+      it's at the beginning of the subject, and even if provided via '--subject'
+      cli option; thanks to Cyril Brulebois for noticing it; Closes: #579596
   * Implement a new --envelope-from cli option (and the corresponding one in the
     configuration file), to allow to select the Envelope From (aka Return-path)
     mail header different than the default, the From address. It reverts the
@@ -34,7 +37,7 @@ reportbug (6.3) UNRELEASED; urgency=low
   * debian/control
     - set 2.6 as minimum python version
 
- -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 17:14:36 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 05 Nov 2011 17:29:31 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution