Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/
Date: Thu, 30 Jun 2011 08:18:15
Message-Id: 815f134f43e801b66fa8856f2b6aefe96786e0fc.zmedico@gentoo
1 commit: 815f134f43e801b66fa8856f2b6aefe96786e0fc
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 08:17:38 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 08:17:38 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=815f134f
7
8 Fix last commit to work regardless of nullglob.
9
10 ---
11 bin/ebuild-helpers/ecompress | 3 ++-
12 1 files changed, 2 insertions(+), 1 deletions(-)
13
14 diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
15 index 9ff1c56..b61421b 100755
16 --- a/bin/ebuild-helpers/ecompress
17 +++ b/bin/ebuild-helpers/ecompress
18 @@ -83,7 +83,8 @@ case $1 in
19 # If PORTAGE_COMPRESS_FLAGS contains -k then we need to avoid
20 # having our glob match the uncompressed file here.
21 suffix=$(echo compressme.*)
22 - [[ -z $suffix ]] && suffix=$(echo compressme*)
23 + [[ -z $suffix || "$suffix" == "compressme.*" ]] && \
24 + suffix=$(echo compressme*)
25 suffix=${suffix#compressme}
26 cd /
27 rm -rf "${tmpdir}"