[Reportbug-commits] r669 - in branches/etch (4 files)

[morph at users.alioth.debian.org]

    Date: Saturday, December 13, 2008 @ 23:19:07
  Author: morph
Revision: 669

s-p-u for #508659

Modified:
  branches/etch/debian/changelog
  branches/etch/debian/control
  branches/etch/reportbug
  branches/etch/reportbug_submit.py

Modified: branches/etch/debian/changelog
===================================================================
--- branches/etch/debian/changelog	2008-12-13 21:04:29 UTC (rev 668)
+++ branches/etch/debian/changelog	2008-12-13 23:19:07 UTC (rev 669)
@@ -1,3 +1,12 @@
+reportbug (3.31+etch1) stable; urgency=low
+
+  * debian/control
+    - added me to uploaders (to avoid NMU)
+  * adapting Don Armstrong's patch to use reportbug.debian.org MX instead of
+    bugs.debian.org
+
+ -- Sandro Tosi <morph at debian.org>  Sat, 13 Dec 2008 23:37:37 +0100
+
 reportbug (3.31) unstable; urgency=low
 
   * Add po4a support for translating man pages.  (Closes: #392458)

Modified: branches/etch/debian/control
===================================================================
--- branches/etch/debian/control	2008-12-13 21:04:29 UTC (rev 668)
+++ branches/etch/debian/control	2008-12-13 23:19:07 UTC (rev 669)
@@ -2,6 +2,7 @@
 Section: utils
 Priority: standard
 Maintainer: Chris Lawrence <lawrencc at debian.org>
+Uploaders: Sandro Tosi <morph at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 5.0.37.2), python-central (>= 0.5), po4a (>= 0.23)
 Build-Depends-Indep: python-dev

Modified: branches/etch/reportbug
===================================================================
--- branches/etch/reportbug	2008-12-13 21:04:29 UTC (rev 668)
+++ branches/etch/reportbug	2008-12-13 23:19:07 UTC (rev 669)
@@ -508,13 +508,13 @@
         print >> fp, '# Disable fallback mode by commenting out the following:'
         print >> fp, 'no-cc'
         print >> fp, 'header "X-Debbugs-CC: %s"' % email_addy
-        print >> fp, 'smtphost bugs.debian.org'
+        print >> fp, 'smtphost reportbug.debian.org'
     else:
         print >> fp, '# If nothing else works, remove the # at the beginning'
         print >> fp, '# of the following three lines:'
         print >> fp, '#no-cc'
         print >> fp, '#header "X-Debbugs-CC: %s"' % email_addy
-        print >> fp, '#smtphost bugs.debian.org'
+        print >> fp, '#smtphost reportbug.debian.org'
         
     print >> fp, '# You can add other settings after this line.  See'
     print >> fp, '# /etc/reportbug.conf for a full listing of options.'
@@ -869,7 +869,10 @@
 
         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 = 'bugs.debian.org'
+            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')
+            smtphost = 'reportbug.debian.org'
 
         if attachments and mua:
             ewrite('Attachments are incompatible with using an MUA.  They will be ignored.\n')

Modified: branches/etch/reportbug_submit.py
===================================================================
--- branches/etch/reportbug_submit.py	2008-12-13 21:04:29 UTC (rev 668)
+++ branches/etch/reportbug_submit.py	2008-12-13 23:19:07 UTC (rev 669)
@@ -356,7 +356,14 @@
             tryagain = False
             ewrite("Connecting to %s via SMTP...\n", smtphost)
             try:
-                conn = smtplib.SMTP(smtphost)
+                conn = None
+                # if we're using reportbug.debian.org, send mail to
+                # submit
+                if smtphost.lower() == 'reportbug.debian.org':
+                    conn = smtplib.SMTP(smtphost,587)
+                else: 
+                    conn = smtplib.SMTP(smtphost)
+
                 response = conn.ehlo()
                 if not (200 <= response[0] <= 299):
                     conn.helo()