summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/ChangeLog4
-rw-r--r--trunk/src/glsa-check/glsa-check7
2 files changed, 9 insertions, 2 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index fd06cbb..9bad1fe 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-19: Paul Varner <fuzzyray@gentoo.org>
+ * glsa-check: Fix imports so mail functionality in glsa-check works
+ with python versions less than 2.5 (Bug 211706)
+
2008-03-13: Paul Varner <fuzzyray@gentoo.org>
* euse: Add --info-installed option from patch provided by Andreas
Waidler. (Bug 212573)
diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check
index 241d3cb..98e5708 100644
--- a/trunk/src/glsa-check/glsa-check
+++ b/trunk/src/glsa-check/glsa-check
@@ -313,8 +313,11 @@ if mode == "mail":
import socket
from StringIO import StringIO
- from email.mime.text import MIMEText
-
+ try:
+ from email.mime.text import MIMEText
+ except ImportError:
+ from email.MIMEText import MIMEText
+
# color doesn't make any sense for mail
nocolor()