| 1 |
k_f 15/02/02 22:25:45 |
| 2 |
|
| 3 |
Added: monkeysign-2.0.2-smtplib.patch |
| 4 |
Removed: monkeysign-1.2-test-no-emit-version.patch |
| 5 |
monkeysign-1.1-rst2s5.patch |
| 6 |
Log: |
| 7 |
Fix NameError: Global name 'SMTPException' is not defined. The patch is already submitted and included upstream. |
| 8 |
|
| 9 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xFED5002857C1ABFA!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: monkeysign-2.0.2-smtplib.patch |
| 18 |
=================================================================== |
| 19 |
From 9e6699ec432b23d56a0728bb25fc2ed1a47a85e6 Mon Sep 17 00:00:00 2001 |
| 20 |
From: Kristian Fiskerstrand <kf@××××××××××××××××.com> |
| 21 |
Date: Mon, 2 Feb 2015 20:38:07 +0100 |
| 22 |
Subject: [PATCH] ui.py: Make sure to use smtplib namespace |
| 23 |
|
| 24 |
Make sure to properly use the smtplib namespace for SMTPException |
| 25 |
in order to avoid a NameError for undefined exception in global |
| 26 |
scope. |
| 27 |
--- |
| 28 |
monkeysign/ui.py | 2 +- |
| 29 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 30 |
|
| 31 |
diff --git a/monkeysign/ui.py b/monkeysign/ui.py |
| 32 |
index c9b6a30..c2308c8 100644 |
| 33 |
--- a/monkeysign/ui.py |
| 34 |
+++ b/monkeysign/ui.py |
| 35 |
@@ -359,7 +359,7 @@ expects an EmailFactory email, but will not mail if nomail is set""" |
| 36 |
self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, srvmsg)) |
| 37 |
try: |
| 38 |
server.starttls() |
| 39 |
- except SMTPException: |
| 40 |
+ except smtplib.SMTPException: |
| 41 |
self.warn(_('SMTP server does not support STARTTLS')) |
| 42 |
if self.options.smtpuser: self.warn(_('authentication credentials will be sent in clear text')) |
| 43 |
if self.options.smtpuser: |
| 44 |
-- |
| 45 |
2.2.2 |
Archives