diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:28:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:28:45 +0000 |
| commit | dd20d4a65f44188b1e5ea5bb17f1766b56a5d4d7 (patch) | |
| tree | 3bf3a65d4fb8ce6c60b3de6307419ec8da3c360f | |
| parent | fix e-mail munging and add see also section (trunk r13402) (diff) | |
| download | portage-multirepo-dd20d4a65f44188b1e5ea5bb17f1766b56a5d4d7.tar.gz portage-multirepo-dd20d4a65f44188b1e5ea5bb17f1766b56a5d4d7.tar.bz2 portage-multirepo-dd20d4a65f44188b1e5ea5bb17f1766b56a5d4d7.zip | |
Bug #71646 - Don't allow the HISTFILE variable into the ebuild environment
since it triggers sandbox violations. (trunk r13403)
svn path=/main/branches/2.1.6/; revision=13544
| -rwxr-xr-x | bin/ebuild.sh | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 9cbd748e..83e79e81 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1620,7 +1620,7 @@ filter_readonly_variables() { SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS} - BASH_.* PATH POSIXLY_CORRECT" + BASH_.* HISTFILE PATH POSIXLY_CORRECT" if hasq --filter-sandbox $* ; then filtered_vars="${filtered_vars} SANDBOX_.*" else diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b8d952e6..6ed19bb7 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1127,7 +1127,7 @@ class config(object): # variables that break bash _environ_filter += [ - "POSIXLY_CORRECT", + "HISTFILE", "POSIXLY_CORRECT", ] # portage config variables and variables set directly by portage |