summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-07-01 20:47:58 +0000
committerZac Medico <zmedico@gentoo.org>2009-07-01 20:47:58 +0000
commit23404ecf0f1dd67b445100d2485a476a3c97c344 (patch)
tree356b0de640b623a3d834153811cda1facf2f3d76
parent7655a30a3e83213678400ee825d705f0e3f6c205 (diff)
downloadportage-23404ecf0f1dd67b445100d2485a476a3c97c344.tar.gz
portage-23404ecf0f1dd67b445100d2485a476a3c97c344.tar.bz2
portage-23404ecf0f1dd67b445100d2485a476a3c97c344.zip
Bug #275947 - Enable build.log when FEATURES=sesandbox is enabled, since
it works when a pty is available (but not through a normal pipe, due to bug #162404). svn path=/main/trunk/; revision=13756
-rw-r--r--pym/portage/__init__.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index dcffbfb6f..e601180ac 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5724,13 +5724,12 @@ def _prepare_workdir(mysettings):
(mysettings["CATEGORY"], mysettings["PF"], logid_time))
del logid_path, logid_time
else:
- # When sesandbox is enabled, only log if PORT_LOGDIR is explicitly
- # enabled since it is possible that local SELinux security policies
- # do not allow ouput to be piped out of the sesandbox domain.
- if not (mysettings.selinux_enabled() and \
- "sesandbox" in mysettings.features):
- mysettings["PORTAGE_LOG_FILE"] = os.path.join(
- mysettings["T"], "build.log")
+ # NOTE: When sesandbox is enabled, the local SELinux security policies
+ # may not allow output to be piped out of the sesandbox domain. The
+ # current policy will allow it to work when a pty is available, but
+ # not through a normal pipe. See bug #162404.
+ mysettings["PORTAGE_LOG_FILE"] = os.path.join(
+ mysettings["T"], "build.log")
def _doebuild_exit_status_check(mydo, settings):
"""