From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1440731-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 69F60158094
for <garchives@archives.gentoo.org>; Thu, 29 Sep 2022 20:45:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DCBFC2BC058;
Thu, 29 Sep 2022 20:45:48 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C36702BC058
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2022 20:45:48 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E60C3340DAB
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2022 20:45:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 14EEE5F8
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Sep 2022 20:45:45 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1664484340.636dd15437eccfaf63e76c36412999b5e118c209.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: /, bin/
X-VCS-Repository: proj/portage
X-VCS-Files: NEWS bin/ecompress
X-VCS-Directories: / bin/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 636dd15437eccfaf63e76c36412999b5e118c209
X-VCS-Branch: master
Date: Thu, 29 Sep 2022 20:45:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0b54192d-93d5-4205-89b2-d7e75a885791
X-Archives-Hash: a52de3f563e31fae923708a91bfda6f4
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