Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 1/4] Revert "ecompress-file: de-duplicate filtered_args (bug 667072)"
Date: Fri, 28 Sep 2018 07:55:38
Message-Id: 20180928075529.7322-2-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 0/4] Proper fix for colliding (un)compressed files by "Michał Górny"
1 Reverts: 1fc311ce0afeef9f982213e43220d079a4ffec26
2 Signed-off-by: Michał Górny <mgorny@g.o>
3 ---
4 bin/ecompress-file | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7 diff --git a/bin/ecompress-file b/bin/ecompress-file
8 index e65b21ee4..18269c91b 100755
9 --- a/bin/ecompress-file
10 +++ b/bin/ecompress-file
11 @@ -13,7 +13,7 @@ compress_file() {
12 done
13 set +f
14 mask_ext_re="^(${mask_ext_re:1})\$"
15 - local -A filtered_args
16 + local filtered_args=()
17 local had_precompressed=
18 for x in "$@" ; do
19 [[ ${x##*.} =~ $mask_ext_re ]] && continue
20 @@ -35,10 +35,10 @@ compress_file() {
21 had_precompressed=1;;
22 esac
23
24 - filtered_args[${x}]=
25 + filtered_args+=( "$x" )
26 done
27 [[ ${#filtered_args[@]} -eq 0 ]] && return 0
28 - set -- "${!filtered_args[@]}"
29 + set -- "${filtered_args[@]}"
30
31 if [[ ${had_precompressed} ]]; then
32 eqawarn "One or more compressed files were found in docompress-ed directories."
33 --
34 2.19.0