diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-07 23:23:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-07 23:23:40 -0700 |
| commit | bc18e1e7c3af475412e997489058c58942ebfdcb (patch) | |
| tree | 807396453e764cfb42796aeef0b11c8d4dbb17a3 /cnf | |
| parent | d448e1f1844fe1fe8b865f8f9080206b84c6f4e3 (diff) | |
| download | portage-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 'cnf')
| -rw-r--r-- | cnf/make.globals | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index fa76c09ee..975726ab6 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -59,12 +59,10 @@ FEATURES="assume-digests binpkg-logs distlocks ebuild-locks # Ignore file collisions in /lib/modules since files inside this directory # are never unmerged, and therefore collisions must be ignored in order for # FEATURES=protect-owned to operate smoothly in all cases. -COLLISION_IGNORE="/lib/modules" - # Ignore file collisions for unowned *.pyo and *.pyc files, this helps during # transition from compiling python modules in live file system to compiling # them in src_install() function. -COLLISION_IGNORE_UNOWNED="*.py[co]" +COLLISION_IGNORE="/lib/modules/* *.py[co]" # Enable preserve-libs for testing with portage versions that support it. # This setting is commented out for portage versions that don't support it. |