Handle empty PORTAGE_COMPRESS for bug #389047.
authorZac Medico <zmedico@gentoo.org>
Mon, 7 Nov 2011 08:14:29 +0000 (00:14 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 7 Nov 2011 08:14:29 +0000 (00:14 -0800)
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

index 76c2718612cb57bf6479a6267936d20d2a0e65f3..fa427757d6abf923cc40169bad564aac7df66516 100755 (executable)
@@ -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"