diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-20 02:17:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-20 02:17:31 +0000 |
| commit | b97c1a0a5c54c55268691211ad6b905a2e63b1c8 (patch) | |
| tree | 6133e15954fea75f3df2c9bb4535a2a30395e6db /bin | |
| parent | 4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04 (diff) | |
| download | portage-b97c1a0a5c54c55268691211ad6b905a2e63b1c8.tar.gz portage-b97c1a0a5c54c55268691211ad6b905a2e63b1c8.tar.bz2 portage-b97c1a0a5c54c55268691211ad6b905a2e63b1c8.zip | |
Add some more variables to filter in filter_readonly_variables()
and save_ebuild_env().
svn path=/main/trunk/; revision=8536
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 240aaf53b..aaaf28826 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1367,7 +1367,7 @@ filter_readonly_variables() { for x in BASH SANDBOX ; do var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}_[_[:alnum:]]*=.*" done - for x in ${readonly_vars} FUNCNAME GROUPS ; do + for x in ${readonly_vars} DIRSTACK FUNCNAME GROUPS PIPESTATUS ; do var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}=.*" done var_grep=${var_grep:1} # strip the first | @@ -1406,10 +1406,11 @@ save_ebuild_env() { ( # misc variables set by bash - unset BASH PWD SHELL + unset BASH IFS OLDPWD OPTERR OPTIND PS4 PWD SHELL # misc variables inherited from the calling environment - unset TERM + unset COLORTERM DISPLAY EDITOR LESS LESSOPEN LOGNAME LS_COLORS PAGER \ + TERM TERMCAP USER # There's no need to bloat environment.bz2 with internally defined # functions and variables, so filter them out if possible. @@ -1436,8 +1437,9 @@ save_ebuild_env() { ECLASSDIR ECLASS_DEPTH EMERGE_DEFAULT_OPTS \ EMERGE_WARNING_DELAY ENDCOL FAKEROOTKEY FEATURES \ FETCHCOMMAND FETCHCOMMAND_FTP FETCHCOMMAND_HTTP FETCHCOMMAND_SFTP \ - GENTOO_MIRRORS GOOD HILITE HOME IMAGE LAST_E_CMD LAST_E_LEN \ - LD_PRELOAD NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ + GENTOO_MIRRORS GOOD HILITE HOME IMAGE \ + KV LAST_E_CMD LAST_E_LEN LD_PRELOAD MOPREFIX \ + NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \ PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BUILDDIR PORTAGE_CALLER \ PORTAGE_COLORMAP PORTAGE_CONFIGROOT \ @@ -1448,9 +1450,10 @@ save_ebuild_env() { PORTAGE_REPO_NAME PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_RSYNC_OPTS \ PORTAGE_RSYNC_RETRIES PORTAGE_TMPFS PORTAGE_WORKDIR_MODE PORTDIR \ PORTDIR_OVERLAY PORT_LOGDIR PROFILE_PATHS PWORKDIR \ - QUICKPKG_DEFAULT_OPTS RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \ + QUICKPKG_DEFAULT_OPTS QA_INTERCEPTORS \ + RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \ RC_INDENTATION RESUMECOMMAND RESUMECOMMAND_HTTP \ - RESUMECOMMAND_HTTP RESUMECOMMAND_SFTP ROOT RPMDIR \ + RESUMECOMMAND_HTTP RESUMECOMMAND_SFTP ROOT ROOTPATH RPMDIR \ S STARTDIR SYNC TMP TMPDIR USE_EXPAND \ USE_EXPAND_HIDDEN USE_ORDER WARN XARGS |