tag 508659 patch
thanks

Find the attached patch which should resolve this.


Don Armstrong

-- 
NASCAR is a Yankee conspiracy to keep you all placated so the South
won't rise again.
 -- http://www.questionablecontent.net/view.php?comic=327

http://www.donarmstrong.com              http://rzlab.ucr.edu
diff -Nru reportbug-3.47/debian/changelog reportbug-3.47/debian/changelog
--- reportbug-3.47/debian/changelog	2008-11-12 09:33:11.000000000 -0600
+++ reportbug-3.47/debian/changelog	2008-12-13 12:42:31.000000000 -0600
@@ -1,3 +1,9 @@
+reportbug (3.47-0.1) unstable; urgency=low
+
+  * Patch for reportbug.debian.org MX instead of bugs.debian.org
+
+ -- Don Armstrong <d...@debian.org>  Sat, 13 Dec 2008 10:42:31 -0800
+
 reportbug (3.47) unstable; urgency=low
 
   * reportbuglib/reportbug_ui_text.py
diff -Nru reportbug-3.47/reportbug reportbug-3.47/reportbug
--- reportbug-3.47/reportbug	2008-11-02 05:24:03.000000000 -0600
+++ reportbug-3.47/reportbug	2008-12-13 12:42:02.000000000 -0600
@@ -570,13 +570,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.'
@@ -944,8 +944,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')
             attachments = []
diff -Nru reportbug-3.47/reportbuglib/reportbug_submit.py reportbug-3.47/reportbuglib/reportbug_submit.py
--- reportbug-3.47/reportbuglib/reportbug_submit.py	2008-11-02 05:24:02.000000000 -0600
+++ reportbug-3.47/reportbuglib/reportbug_submit.py	2008-12-13 12:54:26.000000000 -0600
@@ -243,7 +243,7 @@
 
     # No, I'm not going to do a full MX lookup on every address... get a
     # real MTA!
-    if kudos and smtphost == 'bugs.debian.org':
+    if kudos and smtphost == 'reportbug.debian.org':
         smtphost = 'packages.debian.org'
 
     body_charset = charset
@@ -364,7 +364,13 @@
             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()

Reply via email to