aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-11-07 08:14:29 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-11-07 08:14:29 (GMT)
commit38acf30cbf60c73fade97f121176158af898640c (patch)
tree812b0a6bae297a7dded721bb2dacda1122f6afd2
parentemerge --changelog: ChangeLog-YYYY, bug #389611 (diff)
downloadportage-38acf30cbf60c73fade97f121176158af898640c.zip
portage-38acf30cbf60c73fade97f121176158af898640c.tar.gz
portage-38acf30cbf60c73fade97f121176158af898640c.tar.bz2
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-xbin/ebuild-helpers/ecompressdir6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 76c2718..fa42775 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"