summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/_config/special_env_vars.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-07 23:23:40 -0700
committerZac Medico <zmedico@gentoo.org>2012-05-07 23:23:40 -0700
commitbc18e1e7c3af475412e997489058c58942ebfdcb (patch)
tree807396453e764cfb42796aeef0b11c8d4dbb17a3 /pym/portage/package/ebuild/_config/special_env_vars.py
parentd448e1f1844fe1fe8b865f8f9080206b84c6f4e3 (diff)
downloadportage-bc18e1e7c3af475412e997489058c58942ebfdcb.tar.gz
portage-bc18e1e7c3af475412e997489058c58942ebfdcb.tar.bz2
portage-bc18e1e7c3af475412e997489058c58942ebfdcb.zip
COLLISION_IGNORE: support fnmatch patterns
This allows it to be combined with the COLLISION_IGNORE_UNOWNED variable from commit 33545ea18e8816addb3c54bb26a0cc788b8512e6, so only one variable is needed.
Diffstat (limited to 'pym/portage/package/ebuild/_config/special_env_vars.py')
-rw-r--r--pym/portage/package/ebuild/_config/special_env_vars.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 8eac38034..763237d85 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -134,7 +134,7 @@ environ_filter += [
# portage config variables and variables set directly by portage
environ_filter += [
"ACCEPT_CHOSTS", "ACCEPT_KEYWORDS", "ACCEPT_PROPERTIES", "AUTOCLEAN",
- "CLEAN_DELAY", "COLLISION_IGNORE", "COLLISION_IGNORE_UNOWNED",
+ "CLEAN_DELAY", "COLLISION_IGNORE",
"CONFIG_PROTECT", "CONFIG_PROTECT_MASK",
"EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS",
"EMERGE_LOG_DIR",