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 1QcCHi-0003Ew-Hs for garchives@archives.gentoo.org; Thu, 30 Jun 2011 08:07:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0F051C03E; Thu, 30 Jun 2011 08:07:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C15631C03E for ; Thu, 30 Jun 2011 08:07:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 329441B4025 for ; Thu, 30 Jun 2011 08:07:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4A2F38003C for ; Thu, 30 Jun 2011 08:07:22 +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: Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/ecompress X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a4336dd925767f1a78d7d046110fd7462f676d8d Date: Thu, 30 Jun 2011 08:07:22 +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: X-Archives-Hash: 4f35383e7d10db08142d57f6e9dfb665 commit: a4336dd925767f1a78d7d046110fd7462f676d8d Author: Zac Medico gentoo org> AuthorDate: Thu Jun 30 08:03:44 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 30 08:03:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da4336dd9 ecompress: beware of -k in PORTAGE_COMPRESS_FLAGS This will fix bug #372183. --- bin/ebuild-helpers/ecompress | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress index de81b44..9ff1c56 100755 --- a/bin/ebuild-helpers/ecompress +++ b/bin/ebuild-helpers/ecompress @@ -80,7 +80,10 @@ case $1 in # if it cannot actually compress the file echo {0..1000} > compressme ${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS} compressme > /dev/null - suffix=3D$(ls compressme*) + # If PORTAGE_COMPRESS_FLAGS contains -k then we need to avoid + # having our glob match the uncompressed file here. + suffix=3D$(echo compressme.*) + [[ -z $suffix ]] && suffix=3D$(echo compressme*) suffix=3D${suffix#compressme} cd / rm -rf "${tmpdir}"