* [gentoo-commits] portage r10197 - in main/branches/2.1.2: bin pym
@ 2008-05-05 6:03 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-05 6:03 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-05-05 06:03:43 +0000 (Mon, 05 May 2008)
New Revision: 10197
Modified:
main/branches/2.1.2/bin/isolated-functions.sh
main/branches/2.1.2/pym/portage.py
Log:
Bug #219286 - Whitelist INSTALL_MASK so that it works properly for binary
packages. Also, filter INSTALL_MASK when saving or loading environment.bz2.
This also applies to PKG_INSTALL_MASK and DOC_SYMLINKS_DIR, so add them
too. (trunk r10195)
Modified: main/branches/2.1.2/bin/isolated-functions.sh
===================================================================
--- main/branches/2.1.2/bin/isolated-functions.sh 2008-05-05 06:00:20 UTC (rev 10196)
+++ main/branches/2.1.2/bin/isolated-functions.sh 2008-05-05 06:03:43 UTC (rev 10197)
@@ -485,6 +485,9 @@
ROOT ROOTPATH RPMDIR STARTDIR TMP TMPDIR USE_EXPAND \
WARN XARGS _RC_GET_KV_CACHE
+ # user config variables
+ unset DOC_SYMLINKS_DIR INSTALL_MASK PKG_INSTALL_MASK
+
set
export
)
Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py 2008-05-05 06:00:20 UTC (rev 10196)
+++ main/branches/2.1.2/pym/portage.py 2008-05-05 06:03:43 UTC (rev 10197)
@@ -1098,7 +1098,12 @@
"XARGS",
]
+ # user config variables
_environ_whitelist += [
+ "DOC_SYMLINKS_DIR", "INSTALL_MASK", "PKG_INSTALL_MASK"
+ ]
+
+ _environ_whitelist += [
"A", "AA", "CATEGORY", "P", "PF", "PN", "PR", "PV", "PVR"
]
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-05 6:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-05 6:03 [gentoo-commits] portage r10197 - in main/branches/2.1.2: bin pym Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox