diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-23 11:46:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-23 11:46:41 -0700 |
| commit | 87df7332c631b96a2d238abd2526eb5bb1a6e4f6 (patch) | |
| tree | e34fe3fdbc6255cbf5765971e11594a6e290d60f /man | |
| parent | f0ef754b7dafe892ce58725b32e2146904414b7e (diff) | |
| download | portage-87df7332c631b96a2d238abd2526eb5bb1a6e4f6.tar.gz portage-87df7332c631b96a2d238abd2526eb5bb1a6e4f6.tar.bz2 portage-87df7332c631b96a2d238abd2526eb5bb1a6e4f6.zip | |
merge: handle symlink replacing dir
Previously, these symlinks would trigger a file collision message and
would then be silently dropped in cases when the file collsion did not
cause emerge to bail out due to FEATURES=protect-owned or
collision-protect.
Now, if emerge doesn't bail out due to a file collision, it will
trigger an eerror message and merge the symlink with a .backup.XXXX
extension appended to the file name, similar to handling of regular
files in commit 740f71301ed3daf44c0e77df5d5de39fe1438fb1. This will
fix bug 326685.
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions