diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-01-21 13:32:59 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-01-21 13:32:59 -0800 |
| commit | e3ab6f288110602d59c7e8fee8ee8c514c7a4329 (patch) | |
| tree | 41115c050fdcd164282b6cb9b0956d61ea9cb336 | |
| parent | document --quiet-repo-display (diff) | |
| download | portage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.tar.gz portage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.tar.bz2 portage-e3ab6f288110602d59c7e8fee8ee8c514c7a4329.zip | |
ecompress: don't rename dir symlink, bug #399595
| -rwxr-xr-x | bin/ebuild-helpers/ecompressdir | 4 |
1 files changed, 4 insertions, 0 deletions
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}}" |