From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Jan 2012 21:32:59 +0000 (-0800)
Subject: ecompress: don't rename dir symlink, bug #399595
X-Git-Tag: v2.2.0_alpha85~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3ab6f288110602d59c7e8fee8ee8c514c7a4329;p=portage.git

ecompress: don't rename dir symlink, bug #399595
---

diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 5ba44d755..74973abda 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}}"