diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-16 08:59:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-16 08:59:33 +0000 |
| commit | 2dcc5e159615cacc370645dd26fe81e6e36fb54d (patch) | |
| tree | a874c69814c100d89e3340524bbf9fa2ef9ab920 /bin | |
| parent | c93b12798f3a605a7006b777a094170d580427ea (diff) | |
| download | portage-2dcc5e159615cacc370645dd26fe81e6e36fb54d.tar.gz portage-2dcc5e159615cacc370645dd26fe81e6e36fb54d.tar.bz2 portage-2dcc5e159615cacc370645dd26fe81e6e36fb54d.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 1 |
1 files changed, 1 insertions, 0 deletions
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") |