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

diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 5ba44d755220a18a0454d7fa9c1ef6043db420a5..74973abda4eb52e9395da84f78c0057e044894fa 100755 (executable)
--- 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}}"