[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.1-31-g7c72b81

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 7c72b817bc9bdb8afe7ed67d78bdc6fe68f28539
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Apr 29 00:08:34 2009 +0200

    clarified in the warning message that reportbug.debian.org superseded master|bugs.d.o as smtphost; also merged the check fo the previous 2 hosts; thanks to Goswin von Brederlow for the report; Closes: #525856

diff --git a/bin/reportbug b/bin/reportbug
index dcae600..be27a5c 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -952,11 +952,8 @@ class UI(object):
         if self.options.outfile or self.options.printonly:
             mua = smtphost = None
 
-        if smtphost and smtphost.lower() == 'master.debian.org':
-            ui.long_message('*** Warning: master.debian.org is no longer an appropriate smtphost setting for reportbug; please update your .reportbugrc file.\n')
-            smtphost = 'reportbug.debian.org'
-        if smtphost and smtphost.lower() == 'bugs.debian.org':
-            ui.long_message('*** Warning: bugs.debian.org is no longer an appropriate smtphost setting for reportbug; please update your .reportbugrc file.\n')
+        if smtphost and smtphost.lower() in ('master.debian.org', 'bugs.debian.org'):
+            ui.long_message('*** Warning: %s is no longer an appropriate smtphost setting for reportbug: it has been superseded by reportbug.debian.org and this one is forced as smtphost; please update your .reportbugrc file.\n', smtphost.lower())
             smtphost = 'reportbug.debian.org'
 
         if attachments and mua:
diff --git a/debian/changelog b/debian/changelog
index 5858a0a..35962e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ reportbug (4.2) UNRELEASED; urgency=low
     - decode also email address (previously only realname was) when offering
       configuration; thanks to James Vega for the report and to Carl Chenet for
       the patch: Closes: #524297
+    - clarified in the warning message that reportbug.debian.org superseded
+      master|bugs.d.o as smtphost; also merged the check fo the previous 2
+      hosts; thanks to Goswin von Brederlow for the report; Closes: #525856
   * reportbug/utils.py
     - fixed a typo in redirecting to /dev/null when calling lsb_release; thanks
       to Carl Chenet for the report and patch; Closes: #523684
@@ -38,7 +41,7 @@ reportbug (4.2) UNRELEASED; urgency=low
   [ Y Giridhar Appaji Nag ]
   * Remove Y Giridhar Appaji Nag from Uploaders
 
- -- Sandro Tosi <morph at debian.org>  Wed, 29 Apr 2009 00:01:07 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 29 Apr 2009 00:05:41 +0200
 
 reportbug (4.1) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution