summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-11-05 09:32:05 +0100
committerZac Medico <zmedico@gentoo.org>2012-11-05 00:51:10 -0800
commitb7bab7e4ba071e2a23d124b476698fd12741c4c4 (patch)
treefff6d53ba5f738eb3e60c2630f9c40ed17241be5 /cnf
parent74b7c9d452c97a948852416e1456a3117deec2dc (diff)
downloadportage-b7bab7e4ba071e2a23d124b476698fd12741c4c4.tar.gz
portage-b7bab7e4ba071e2a23d124b476698fd12741c4c4.tar.bz2
portage-b7bab7e4ba071e2a23d124b476698fd12741c4c4.zip
COLLISION_IGNORE jython compiled modules as well.
Jython names its compiled modules *$py.class.
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.globals2
1 files changed, 1 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index 47ee787c6..80a68f7d6 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -63,7 +63,7 @@ FEATURES="assume-digests binpkg-logs
# 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="/lib/modules/* *.py[co]"
+COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class"
UNINSTALL_IGNORE="/lib/modules/*"
# By default wait 5 secs before cleaning a package