diff options
| author |   Marius Mauch <genone@gentoo.org> | 2005-04-23 14:05:28 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2005-04-23 14:05:28 +0000 |
| commit | a63e3bcda7e817bafa4a42afa557f4d8acba8799 (patch) | |
| tree | c2e071714573f09b1f6c97f7464b373c08ec97a7 /pym | |
| parent | Clean up some silly `cat` usages and make the output format pretty. (diff) | |
| download | portage-cvs-a63e3bcda7e817bafa4a42afa557f4d8acba8799.tar.gz portage-cvs-a63e3bcda7e817bafa4a42afa557f4d8acba8799.tar.bz2 portage-cvs-a63e3bcda7e817bafa4a42afa557f4d8acba8799.zip | |
forward port fix for bug 77794
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/ebuild.py | 6 | ||||
| -rw-r--r-- | pym/elog_modules/mod_mail.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pym/ebuild.py b/pym/ebuild.py index 8d45f34..e6ed795 100644 --- a/pym/ebuild.py +++ b/pym/ebuild.py @@ -2,7 +2,7 @@ # ebuild.py; Ebuild classes/abstraction of phase processing, and communicating with a ebuild-daemon.sh instance # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -#$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/ebuild.py,v 1.22 2005/04/12 22:37:12 vapier Exp $ +#$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/ebuild.py,v 1.23 2005/04/23 14:05:28 genone Exp $ import os,sys,traceback @@ -767,9 +767,9 @@ class ebuild_handler: elif mydo=="digest": #since we are calling "digest" directly, recreate the digest even if it already exists - return (not digestgen(checkme,mysettings,overwrite=1,verbosity=verbosity)) + return (not digestgen(aalist,mysettings,overwrite=1,verbosity=verbosity)) if mydo=="manifest": - return (not digestgen(checkme,mysettings,overwrite=1,manifestonly=1,verbosity=verbosity)) + return (not digestgen(aalist,mysettings,overwrite=1,manifestonly=1,verbosity=verbosity)) if not digestcheck(checkme, mysettings, ("strict" in features),verbosity=verbosity): return 1 diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py index ed9d8cc..554f5b6 100644 --- a/pym/elog_modules/mod_mail.py +++ b/pym/elog_modules/mod_mail.py @@ -1,4 +1,4 @@ -import smtplib, email.Message +import smtplib, email.Message, socket def process(mysettings, cpv, logentries, fulltext): mymailhost = "localhost" @@ -49,5 +49,6 @@ def process(mysettings, cpv, logentries, fulltext): myconn.quit() except smtplib.SMTPException, e: raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+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?")) return |