From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 7 Nov 2011 08:14:29 +0000 (-0800)
Subject: Handle empty PORTAGE_COMPRESS for bug #389047.
X-Git-Tag: v2.2.0_alpha73~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38acf30cbf60c73fade97f121176158af898640c;p=portage.git

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.
---

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"