From 38acf30cbf60c73fade97f121176158af898640c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 7 Nov 2011 00:14:29 -0800 Subject: [PATCH] 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. --- bin/ebuild-helpers/ecompressdir | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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" -- 2.26.2