diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-01-19 01:20:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-19 01:20:37 +0000 |
| commit | 4d2bb88cb90e8dba5e343ec9f6cc30b50bc1387a (patch) | |
| tree | 23ac13f57ebc9982f8f618dbea50396036a882e5 /pym | |
| parent | 3548aaa212dacd286990ddca15c3b539c54fadf8 (diff) | |
| download | portage-4d2bb88cb90e8dba5e343ec9f6cc30b50bc1387a.tar.gz portage-4d2bb88cb90e8dba5e343ec9f6cc30b50bc1387a.tar.bz2 portage-4d2bb88cb90e8dba5e343ec9f6cc30b50bc1387a.zip | |
For bug #162404, 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. (trunk r5718)
svn path=/main/branches/2.1.2/; revision=5719
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 92463ea97..542f3ae86 100644 --- 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 |