diff options
| author |   Marius Mauch <genone@gentoo.org> | 2005-08-11 17:38:44 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2005-08-11 17:38:44 +0000 |
| commit | 9455c20172054f2e9c0541e403e0ddd0adea4aff (patch) | |
| tree | 0dd270a555f60b578585119f69ef02a403876887 | |
| parent | clean up syntax and quoting and such (diff) | |
| download | portage-cvs-9455c20172054f2e9c0541e403e0ddd0adea4aff.tar.gz portage-cvs-9455c20172054f2e9c0541e403e0ddd0adea4aff.tar.bz2 portage-cvs-9455c20172054f2e9c0541e403e0ddd0adea4aff.zip | |
minor bugfixes for exception handler
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pym/elog_modules/mod_mail.py | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,12 +1,16 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.999 2005/08/10 22:09:19 vapier Exp $ +# $Id: ChangeLog,v 1.1000 2005/08/11 17:38:44 genone Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 11 Aug 2005; Marius Mauch <genone@gentoo.org> pym/elog_modules/mod_mail.py: + Fixed missing portage_exception import and type errors in the exception + handler. + 10 Aug 2005; Mike Frysinger <vapier@gentoo.org> bin/quickpkg: Call gawk instead of awk so non-GNU systems work #102050 by Stephen Bennett. Also clean up the script a bit. diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py index 9528e30..397405b 100644 --- a/pym/elog_modules/mod_mail.py +++ b/pym/elog_modules/mod_mail.py @@ -1,4 +1,4 @@ -import smtplib, email.Message, socket +import smtplib, email.Message, socket, portage_exception def process(mysettings, cpv, logentries, fulltext): mymailhost = "localhost" @@ -48,7 +48,7 @@ def process(mysettings, cpv, logentries, fulltext): myconn.sendmail("portage", myrecipient, mymessage.as_string()) myconn.quit() except smtplib.SMTPException, e: - raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+e) + raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e)) except socket.error, e: - raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+e+"\nSure you configured PORTAGE_LOG_MAILURI correctly?") + raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_LOG_MAILURI correctly?") return |