[Reportbug-commits] [reportbug] 04/12: dont escape a single dot line surrounded by newlines (the End-Of-Message in SMTP), it is done by sendmail() automatically; Closes: #808742

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit bf0d3a17102ac8a50030858924544b7cd8c5f7ba
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Dec 31 14:32:48 2015 +0000

    dont escape a single dot line surrounded by newlines (the End-Of-Message in SMTP), it is done by sendmail() automatically; Closes: #808742
---
 debian/changelog    | 4 +++-
 reportbug/submit.py | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5baa62..27ba44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ reportbug (6.6.6) UNRELEASED; urgency=medium
       Closes: #777010, #686922
     - decode email addresses when printing the recipients recap at submit time;
       Closes: #546914
+    - dont escape a single dot line surrounded by newlines (the End-Of-Message
+      in SMTP), it is done by sendmail() automatically; Closes: #808742
   * debian/control
     - add dep on 'file' for python-reportbug; Closes: #803764
   * reportbug/ui/text_ui.py
@@ -26,7 +28,7 @@ reportbug (6.6.6) UNRELEASED; urgency=medium
   * reportbug/ui/gtk2_ui.py
     - switch from gtkspell (now removed) to gtkspellcheck; Closes: #802387
 
- -- Sandro Tosi <morph at debian.org>  Thu, 31 Dec 2015 14:15:42 +0000
+ -- Sandro Tosi <morph at debian.org>  Thu, 31 Dec 2015 14:31:38 +0000
 
 reportbug (6.6.5) unstable; urgency=medium
 
diff --git a/reportbug/submit.py b/reportbug/submit.py
index 51fd0bb..253fa50 100644
--- a/reportbug/submit.py
+++ b/reportbug/submit.py
@@ -378,7 +378,6 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
 
     if smtphost:
         toaddrs = [x[1] for x in alist]
-        smtp_message = re.sub(r'(?m)^[.]', '..', message)
 
         tryagain = True
         refused = None
@@ -408,7 +407,7 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
                             'Enter SMTP password for %s@%s: ' %
                             (smtpuser, smtphost))
                     conn.login(smtpuser, smtppasswd)
-                refused = conn.sendmail(fromaddr, toaddrs, smtp_message)
+                refused = conn.sendmail(fromaddr, toaddrs, message)
                 conn.quit()
             except (socket.error, smtplib.SMTPException), x:
                 # If wrong password, try again...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git