From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RNKpU-000280-Sv for garchives@archives.gentoo.org; Mon, 07 Nov 2011 08:45:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEBFA21C01F; Mon, 7 Nov 2011 08:45:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8B37621C01F for ; Mon, 7 Nov 2011 08:45:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 921A01B4028 for ; Mon, 7 Nov 2011 08:45:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AF0C380042 for ; Mon, 7 Nov 2011 08:45:10 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh bin/save-ebuild-env.sh pym/portage/package/ebuild/_config/special_env_vars.py X-VCS-Directories: pym/portage/package/ebuild/_config/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c17d8dabe4c64fc4ed87ac9a0637f8ccc9341823 Date: Mon, 7 Nov 2011 08:45:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a809530a-7950-4990-bd09-7827e9c14e32 X-Archives-Hash: 446bb873f0e2208c34b881ac6bd3fb2c commit: c17d8dabe4c64fc4ed87ac9a0637f8ccc9341823 Author: Zac Medico gentoo org> AuthorDate: Mon Nov 7 08:45:01 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 7 08:45:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc17d8dab environment.bz2: filter more variables --- bin/phase-functions.sh | 2 +- bin/save-ebuild-env.sh | 6 ++++-- .../package/ebuild/_config/special_env_vars.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 9dcbf76..ea3f8a6 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -84,7 +84,7 @@ filter_readonly_variables() { local bash_misc_vars=3D"BASH BASH_.* COMP_WORDBREAKS HISTCMD HISTFILE HOSTNAME HOSTTYPE IFS LINENO MACHTYPE OLDPWD OPTERR OPTIND OSTYPE POSIXLY_CORRECT PS4 PWD RANDOM - SECONDS SHELL SHLVL" + SECONDS SHELL SHLVL _" local filtered_sandbox_vars=3D"SANDBOX_ACTIVE SANDBOX_BASHRC SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index f99d204..23e7aaa 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -13,7 +13,8 @@ save_ebuild_env() { ( if has --exclude-init-phases $* ; then - unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_ + unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_ \ + PORTAGE_DOCOMPRESS PORTAGE_DOCOMPRESS_SKIP if [[ -n $PYTHONPATH && ${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then if [[ $PYTHONPATH =3D=3D *:* ]] ; then @@ -78,7 +79,8 @@ save_ebuild_env() { GOOD HILITE HOME \ LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ - PORTAGE_BASHRCS_SOURCED PORTAGE_NONFATAL PORTAGE_QUIET \ + PORTAGE_BASHRCS_SOURCED PORTAGE_COMPRESS_EXCLUDE_SUFFIXES \ + PORTAGE_NONFATAL PORTAGE_QUIET \ PORTAGE_SANDBOX_DENY PORTAGE_SANDBOX_PREDICT \ PORTAGE_SANDBOX_READ PORTAGE_SANDBOX_WRITE PREROOTPATH \ QA_INTERCEPTORS \ diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym= /portage/package/ebuild/_config/special_env_vars.py index 87dccb1..206836d 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -50,7 +50,7 @@ environ_whitelist +=3D [ "PORTAGE_BINPKG_TMPFILE", "PORTAGE_BIN_PATH", "PORTAGE_BUILDDIR", "PORTAGE_BUNZIP2_COMMAND", "PORTAGE_BZIP2_COMMAND", - "PORTAGE_COLORMAP", + "PORTAGE_COLORMAP", "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES", "PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR", "PORTAGE_EBUILD_EXIT_FILE", "PORTAGE_FEATURES", "PORTAGE_GID", "PORTAGE_GRPNAME", @@ -143,6 +143,7 @@ environ_filter +=3D [ "FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP", "GENTOO_MIRRORS", "NOCONFMEM", "O", "PORTAGE_BACKGROUND", "PORTAGE_BACKGROUND_UNMERGE", + "PORTAGE_BINHOST", "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_BUILDIR_LOCKED", "PORTAGE_ELOG_CLASSES", "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT",