From 7c5568fdee3f46177f913a99c98f245d07034837 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Mon, 22 Sep 2014 17:18:01 -0400
Subject: [PATCH] smtp reports a stack trace
commit 1dbc8ce4faf3591d7885a9c86fb09d4ec54cd5b4 broke smtp: the msg
variable to the function gets overridden by the return value of the smtp
connection.
---
monkeysign/ui.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/monkeysign/ui.py b/monkeysign/ui.py
index 8c7bcba..41f68fb 100644
--- a/monkeysign/ui.py
+++ b/monkeysign/ui.py
@@ -343,11 +343,11 @@ expects an EmailFactory email, but will not mail if nomail is set"""
# to be nicer to users, we could catch socket.error exceptions from
# server.connect() here and display a meaningful message to stderr.
try:
- (code, msg) = server.connect(self.options.smtpserver)
+ (code, srvmsg) = server.connect(self.options.smtpserver)
except (socket.error, socket.timeout) as e:
self.abort(_('Error connecting to SMTP server %s: %s') % (self.options.smtpserver, e))
if code != 220:
- self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, msg))
+ self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, srvmsg))
try:
server.starttls()
except SMTPException:
--
GitLab