summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-23 06:28:27 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-23 06:28:27 +0000
commit67fe24f8dd2cc37851248f9a9bb209800d74b12c (patch)
treedd98fe9e70b83321f65e18bdd9cbf99696bfade8
parent34c84ecedb1c26e852e8d1280aa996ee6a9b017a (diff)
downloadportage-67fe24f8dd2cc37851248f9a9bb209800d74b12c.tar.gz
portage-67fe24f8dd2cc37851248f9a9bb209800d74b12c.tar.bz2
portage-67fe24f8dd2cc37851248f9a9bb209800d74b12c.zip
Use secpass to determine whether emergelog exceptions should be ignored.
svn path=/main/trunk/; revision=3619
-rwxr-xr-xbin/emerge6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 1ab1874a3..803640d28 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -21,6 +21,7 @@ import portage_util
import portage_locks
import portage_exception
from portage_const import PROFILE_PATH
+from portage_data import secpass
portage.global_updates(
portage.settings, portage.db, portage.mtimedb["updates"])
@@ -477,9 +478,8 @@ def emergelog(mystr,short_msg=None):
portage_locks.unlockfile(l)
mylogfile.close()
except (IOError,OSError,portage_exception.PortageException), e:
- if edebug:
- print "emergelog():",e
- pass
+ if secpass >= 1:
+ print >> sys.stderr, "emergelog():",e
def emergeexit():
"""This gets out final log message in before we quit."""