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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3787E158020 for ; Tue, 18 Oct 2022 03:40:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BB41E0933; Tue, 18 Oct 2022 03:40:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 4139CE0933 for ; Tue, 18 Oct 2022 03:40:14 +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 654DD340B1C for ; Tue, 18 Oct 2022 03:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C67B3615 for ; Tue, 18 Oct 2022 03:40:11 +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: <1666064407.c81e799a3bc8de79ade7c5e2610ed305581c73cc.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, /, bin/ X-VCS-Repository: proj/portage X-VCS-Files: NEWS bin/ebuild-helpers/prepinfo bin/misc-functions.sh X-VCS-Directories: bin/ bin/ebuild-helpers/ / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c81e799a3bc8de79ade7c5e2610ed305581c73cc X-VCS-Branch: master Date: Tue, 18 Oct 2022 03:40:11 +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: fd70a861-46e0-4019-ad4b-831bc28e061d X-Archives-Hash: b2c8e45e485080c780108a44a1ac7ea7 commit: c81e799a3bc8de79ade7c5e2610ed305581c73cc Author: Sam James gentoo org> AuthorDate: Tue Oct 18 03:16:02 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 18 03:40:07 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c81e799a info: drop .lz4/.lzo for info, use sorted list Use same ordering of suffixes as we do elsewhere for easy comparison. (I threw in .lz4 & .lzo last-minute earlier but on reflection, it's misleading to put it here if it's not supported yet by texinfo.) Fixes: 800e09a4a1a630548ea8316e5c906c6f48af3105 Bug: https://bugs.gentoo.org/757525 Signed-off-by: Sam James gentoo.org> NEWS | 2 +- bin/ebuild-helpers/prepinfo | 2 +- bin/misc-functions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 780684966..3e2a5a2d6 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,7 @@ Features: * -Wodr * ecompress, etc: Support additional compression suffixes for texinfo: - .xz, .lz, .lz4, .zst, .lzma (bug #757525). + .Z, .bz2, .lzma, .lz, .xz, .zst (bug #757525). Bug fixes: * Manifest: Fix Manifest.addFile() calls and add tests (bug #875860). diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo index 4d200d0d3..14fa38226 100755 --- a/bin/ebuild-helpers/prepinfo +++ b/bin/ebuild-helpers/prepinfo @@ -32,7 +32,7 @@ find "${ED%/}/${infodir#/}" -type d -print0 | while read -r -d $'\0' x ; do [[ -e ${f} ]] && continue 2 done - rm -f "${x}"/dir{,.info}{,.gz,.bz2,.xz,.lz,.zst,.lzma,.lz4} + rm -f "${x}"/dir{,.info}{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst} done exit 0 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 2fa61cf37..fc2a36fb3 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -253,7 +253,7 @@ install_qa_check() { fi # Portage regenerates this on the installed system. - rm -f "${ED%/}"/usr/share/info/dir{,.gz,.bz2,.xz,.lz,.zst,.lzma,.lz4} || die "rm failed!" + rm -f "${ED%/}"/usr/share/info/dir{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst} || die "rm failed!" } __dyn_instprep() {