aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-16 19:44:15 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-05-16 19:44:15 (GMT)
commit9ebe11e40796c8d000a50eac0d9bce1f630c5668 (patch)
treead83913a0d3690c9b51b51f7190d4d98a59b3363
parentconfig: fix /etc/portage/make.profile error msg (diff)
downloadportage-9ebe11e40796c8d000a50eac0d9bce1f630c5668.zip
portage-9ebe11e40796c8d000a50eac0d9bce1f630c5668.tar.gz
portage-9ebe11e40796c8d000a50eac0d9bce1f630c5668.tar.bz2
_eapi_invalid: elog permission issue, bug #416231
-rw-r--r--pym/portage/package/ebuild/_eapi_invalid.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/_eapi_invalid.py b/pym/portage/package/ebuild/_eapi_invalid.py
index 1ee8a8b..d23677d 100644
--- a/pym/portage/package/ebuild/_eapi_invalid.py
+++ b/pym/portage/package/ebuild/_eapi_invalid.py
@@ -3,6 +3,7 @@
import textwrap
+import portage
from portage.dep import _repo_separator
from portage.elog import elog_process
from portage.elog.messages import eerror
@@ -40,7 +41,14 @@ def eapi_invalid(self, cpv, repo_name, settings,
" FEATURES=parse-eapi-ebuild-head in make.conf in order to"
" make this error fatal."), 70))
- for line in msg:
- eerror(line, phase="other", key=cpv)
- elog_process(cpv, settings,
- phasefilter=("other",))
+ if portage.data.secpass >= 2:
+ # TODO: improve elog permission error handling (bug #416231)
+ for line in msg:
+ eerror(line, phase="other", key=cpv)
+ elog_process(cpv, settings,
+ phasefilter=("other",))
+
+ else:
+ out = portage.output.EOutput()
+ for line in msg:
+ out.eerror(line)