From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 2F7E015827B for ; Wed, 20 Aug 2025 02:39:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0A5E534245F for ; Wed, 20 Aug 2025 02:39:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E6320110280; Wed, 20 Aug 2025 02:39:32 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D32A7110280 for ; Wed, 20 Aug 2025 02:39:32 +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 6C329342455 for ; Wed, 20 Aug 2025 02:39:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 975DB3345 for ; Wed, 20 Aug 2025 02:39:30 +0000 (UTC) From: "Kerin Millar" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kerin Millar" Message-ID: <1755657361.545e4af5d2b50214998351268d2ba4844e9c48af.kfm@gentoo> Subject: [gentoo-commits] proj/locale-gen:master commit in: / X-VCS-Repository: proj/locale-gen X-VCS-Files: locale-gen X-VCS-Directories: / X-VCS-Committer: kfm X-VCS-Committer-Name: Kerin Millar X-VCS-Revision: 545e4af5d2b50214998351268d2ba4844e9c48af X-VCS-Branch: master Date: Wed, 20 Aug 2025 02:39:30 +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: 4e428035-209b-452d-b20f-fd258c9dd2b0 X-Archives-Hash: 63e62322b72de7fa9522367bbcf3bac0 commit: 545e4af5d2b50214998351268d2ba4844e9c48af Author: Kerin Millar plushkava net> AuthorDate: Wed Aug 20 02:34:26 2025 +0000 Commit: Kerin Millar plushkava net> CommitDate: Wed Aug 20 02:36:01 2025 +0000 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=545e4af5 Support charmaps compressed with bzip2 Character map files may be uncompressed, compressed with gzip, or compressed with bzip2. Revise the get_valid_charmaps() subroutine so that it is able to handle the latter case. Signed-off-by: Kerin Millar plushkava.net> locale-gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale-gen b/locale-gen index 3f21196..8d9fc94 100755 --- a/locale-gen +++ b/locale-gen @@ -323,7 +323,7 @@ sub get_valid_charmaps ($prefix) { my $top = catdir($prefix, '/usr/share/i18n/charmaps'); if (! opendir my $dh, $top) { die "$PROGRAM: Can't open '$top' for reading: $!\n"; - } elsif (! (my @names = map +( -f "$top/$_" ? s/\.gz\z//r : () ), readdir $dh)) { + } elsif (! (my @names = map +( -f "$top/$_" ? s/\.(gz|bz2)\z//nr : () ), readdir $dh)) { die "$PROGRAM: Failed to compose a list of valid character maps from '$top'\n"; } else { return @names;