For bug #162404, when sesandbox is enabled, only log if PORT_LOGDIR is explicitly...

svn path=/main/branches/2.1.2/; revision=5719

diff --git a/pym/portage.py b/pym/portage.py
index 92463ea979e25b4b497d01c54edf630231066a37..542f3ae86d7277e2919c555d90ebfb21ddf34df6 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3202,7 +3202,13 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
                        (mysettings["CATEGORY"], mysettings["PF"], logid_time))
                del logid_path, logid_time
        else:
-               mysettings["PORTAGE_LOG_FILE"] = os.path.join(mysettings["T"], "build.log")
+               # 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")
 
 _doebuild_manifest_exempt_depend = 0
 _doebuild_manifest_checked = None