From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RNKLu-0001Ow-E1 for garchives@archives.gentoo.org; Mon, 07 Nov 2011 08:14:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80DF321C03A; Mon, 7 Nov 2011 08:14:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 51CF221C03A for ; Mon, 7 Nov 2011 08:14:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7D4264C5D for ; Mon, 7 Nov 2011 08:14:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1AC7C80042 for ; Mon, 7 Nov 2011 08:14:37 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <38acf30cbf60c73fade97f121176158af898640c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/ecompressdir X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 38acf30cbf60c73fade97f121176158af898640c Date: Mon, 7 Nov 2011 08:14:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fb5fb69f-0239-4b6b-8059-5d3bb9c973d2 X-Archives-Hash: 9b3362c2be9dacda96a7225630d78cca commit: 38acf30cbf60c73fade97f121176158af898640c Author: Zac Medico gentoo org> AuthorDate: Mon Nov 7 08:14:29 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Nov 7 08:14:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D38acf30c 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 files changed, 5 insertions(+), 1 deletions(-) diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompre= ssdir 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}"' \; =20 # 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" =20