[gentoo-commits] proj/portage:master commit in: bin/

[Sam James]

commit:     ed6d480cde8b6331b11bf0360c1b531245fe49c1
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jun  8 10:51:35 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  8 13:36:11 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ed6d480c

ecompress: ensure that LC_COLLATE=C is effective in do_ignore()

For LC_COLLATE to have an effect, LC_ALL must either be unset or have
the null string as its value. Make it so.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/ecompress | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/ecompress b/bin/ecompress
index bec080a606..d848d18275 100755
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# shellcheck disable=SC1007
 
 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
 
@@ -12,6 +13,7 @@ else
 fi
 
 do_ignore() {
+       local -x LC_ALL= LC_COLLATE=C
        local -a skip_dirs
        local skip
 
@@ -42,9 +44,9 @@ do_ignore() {
        if [[ -s ${T}/.ecompress_skip_files && -s 
${T}/.ecompress_had_precompressed ]]; then
                # Filter skipped files from ${T}/.ecompress_had_precompressed,
                # using temporary files since these lists can be extremely 
large.
-               LC_COLLATE=C sort -u -- "${T}"/.ecompress_skip_files > 
"${T}"/.ecompress_skip_files_sorted \
-               && LC_COLLATE=C sort -u -- "${T}"/.ecompress_had_precompressed 
> "${T}"/.ecompress_had_precompressed_sorted \
-               && LC_COLLATE=C comm -13 -- 
"${T}"/.ecompress_{skip_files,had_precompressed}_sorted > 
"${T}"/.ecompress_had_precompressed || die
+               sort -u -- "${T}"/.ecompress_skip_files > 
"${T}"/.ecompress_skip_files_sorted \
+               && sort -u -- "${T}"/.ecompress_had_precompressed > 
"${T}"/.ecompress_had_precompressed_sorted \
+               && comm -13 -- 
"${T}"/.ecompress_{skip_files,had_precompressed}_sorted > 
"${T}"/.ecompress_had_precompressed || die
                rm -f -- 
"${T}"/.ecompress_{had_precompressed_sorted,skip_files{,_sorted}}
        fi
 }