From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC393158094 for ; Thu, 29 Sep 2022 20:45:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ECF92BC04F; Thu, 29 Sep 2022 20:45:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2513C2BC04F for ; Thu, 29 Sep 2022 20:45:47 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59CEA340DAB for ; Thu, 29 Sep 2022 20:45:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BFEA5EE for ; Thu, 29 Sep 2022 20:45:44 +0000 (UTC) From: "Sam James" 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" Message-ID: <1664484339.21c5d50a8e19be846e286ed06136822f89f4c4c2.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: 21c5d50a8e19be846e286ed06136822f89f4c4c2 X-VCS-Branch: master Date: Thu, 29 Sep 2022 20:45:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff137f84-5c11-4885-85de-7a18c4cfeb68 X-Archives-Hash: a5e29e86b2c2d7b6ffb853894bdc5ab7 commit: 21c5d50a8e19be846e286ed06136822f89f4c4c2 Author: Sam James gentoo org> AuthorDate: Thu Sep 29 06:37:19 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 29 20:45:39 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=21c5d50a bin: ecompress: zstd: add .zst to internal compression collision check Signed-off-by: Sam James gentoo.org> NEWS | 3 +++ bin/ecompress | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 67cb6a795..dced9688a 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,9 @@ Bug fixes: * data: Fix PORTAGE_USERNAME default (bug #873088). +* bin: ecompress: zstd: Recognize .zst as a compressed file suffix for the purposes + of the internal compressed file collision check. + portage-3.0.37 (2022-09-23) -------------- diff --git a/bin/ecompress b/bin/ecompress index a77bb7e35..7fb2b9c00 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|*.xz) + *.Z|*.gz|*.bz2|*.lzma|*.xz|*.zst) vpath=${path%.*} - for comp in '' .Z .gz .bz2 .lzma .xz; do + for comp in '' .Z .gz .bz2 .lzma .xz .zst; do if [[ ${vpath}${comp} != ${path} && \ -e ${vpath}${comp} ]]; then collisions[${path}]=1