aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-01-21 21:32:59 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-01-21 21:32:59 (GMT)
commite3ab6f288110602d59c7e8fee8ee8c514c7a4329 (patch)
tree41115c050fdcd164282b6cb9b0956d61ea9cb336
parentdocument --quiet-repo-display (diff)
downloadportage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.zip
portage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.tar.gz
portage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.tar.bz2
ecompress: don't rename dir symlink, bug #399595
-rwxr-xr-xbin/ebuild-helpers/ecompressdir4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 5ba44d7..74973ab 100755
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -69,6 +69,10 @@ funk_up_dir() {
while read -r -d $'\0' brokenlink ; do
[[ -e ${brokenlink} ]] && continue
olddest=$(readlink "${brokenlink}")
+ # Ignore temporarily broken symlinks due to
+ # _relocate_skip_dirs (bug #399595).
+ skip_dir_dest=${T}/ecompress-skip/${actual_dir#${ED}}/${brokenlink%/*}/${olddest}
+ [[ -e ${skip_dir_dest} ]] && continue
[[ ${act} == "compress" ]] \
&& newdest="${olddest}${suffix}" \
|| newdest="${olddest%${suffix}}"