From 2dcc5e159615cacc370645dd26fe81e6e36fb54d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Oct 2006 08:59:33 +0000
Subject: For bug #133908, prevent collisions in ${PKGDIR}/All/ by
 automatically bumping colliding packages to ${PKGDIR}/${CATEGORY}/ just
 before a collision would occur.  Newly built packages are always stored in
 ${PKGDIR}/All/, should this be 100% compatible with previous behavior.

svn path=/main/trunk/; revision=4722
---
 bin/emerge | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin')

diff --git a/bin/emerge b/bin/emerge
index 89cf55746..4d700ef19 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2254,6 +2254,7 @@ class MergeTask(object):
 						short_msg = "emerge: (%s of %s) %s Compile" % \
 							(mergecount, len(mymergelist), pkg_key)
 						emergelog(xterm_titles, msg, short_msg=short_msg)
+						self.trees[myroot]["bintree"].prevent_collision(pkg_key)
 						retval = portage.doebuild(y, "package", myroot,
 							pkgsettings, self.edebug, mydbapi=portdb,
 							tree="porttree")
-- 
cgit v1.2.3-1-g7c22