diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-11-07 00:14:29 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-11-07 00:14:29 -0800 |
commit | 38acf30cbf60c73fade97f121176158af898640c (patch) | |
tree | 812b0a6bae297a7dded721bb2dacda1122f6afd2 | |
parent | 69d7f169ba2e27cf56746791331c63a019357100 (diff) | |
download | portage-38acf30cbf60c73fade97f121176158af898640c.tar.gz portage-38acf30cbf60c73fade97f121176158af898640c.tar.bz2 portage-38acf30cbf60c73fade97f121176158af898640c.zip |
Handle empty PORTAGE_COMPRESS for bug #389047.
This fixes a case where empty PORTAGE_COMPRESS made ecompressdir forget
to call restore_skip_dirs, such that docompress -x resulted in files
not being installed due to hide_skip_dirs hiding them permanently.
-rwxr-xr-x | bin/ebuild-helpers/ecompressdir | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index 76c271861..fa427757d 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -133,7 +133,11 @@ for dir in "$@" ; do 'cp -p "${file}" "${file}.ecompress.break" ; mv -f "${file}.ecompress.break" "${file}"' \; # now lets do our work - [[ -z ${suffix} ]] && continue + if [[ -z ${suffix} ]] ; then + restore_skip_dirs + continue + fi + vecho "${0##*/}: $(ecompress --bin) /${actual_dir#${ED}}" funk_up_dir "compress" "${suffix}" "ecompress" |