commit: 636dd15437eccfaf63e76c36412999b5e118c209
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 20:44:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 20:45:40 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=636dd154
bin: ecompress: add .lz and .lzo for internal collision check too
Signed-off-by: Sam James <sam <AT> gentoo.org>
NEWS | 3 +++
bin/ecompress | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 31927c819..64095d920 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ Bug fixes:
* bin: ecompress: lz4: Recognize .lz4 as a compressed file suffix for the
purposes
of the internal compressed file collision check.
+* bin: compress: Recognize .lzo and .lz for the internal compressed file
+ collision check too.
+
* bin: ecompress: zstd: Set '-q --rm' in PORTAGE_COMPRESS_FLAGS to behave
like other compressors.
diff --git a/bin/ecompress b/bin/ecompress
index 6d47059da..3e4b77a45 100755
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -71,9 +71,9 @@ while [[ $# -gt 0 ]] ; do
# note: to save time, we need to do this only
if there's
# at least one compressed file
case ${path} in
- *.Z|*.gz|*.bz2|*.lzma|.lz4|*.xz|*.zst)
+
*.Z|*.gz|*.bz2|*.lzma|.lz|.lzo|.lz4|*.xz|*.zst)
vpath=${path%.*}
- for comp in '' .Z .gz .bz2
.lzma .lz4 .xz .zst; do
+ for comp in '' .Z .gz .bz2
.lzma .lz .lzo .lz4 .xz .zst; do
if [[ ${vpath}${comp}
!= ${path} && \
-e
${vpath}${comp} ]]; then
collisions[${path}]=1
