commit:     6630638192ff824dd9441fd9ff838f51a8531a28
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Fri Jan  9 03:14:21 2026 +0000
Commit:     Kerin Millar <kfm <AT> plushkava <DOT> net>
CommitDate: Fri Jan  9 03:14:21 2026 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=66306381

Tidy up the check_effective_locale() subroutine a little

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>

 locale-gen | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/locale-gen b/locale-gen
index 9260240..93ae495 100644
--- a/locale-gen
+++ b/locale-gen
@@ -628,10 +628,7 @@ sub install_archive ($src_path, $dst_path, 
$may_reset_labels) {
 
 sub check_effective_locale ($supported_by) {
        my $locale = first(sub { length $_ }, @ENV{'LC_ALL', 'LANG'});
-       if (! defined $locale || $locale =~ m/\./) {
-               # No locale is effective, or that which is specifies a codeset.
-               return;
-       } elsif (exists $supported_by->{$locale}) {
+       if (defined $locale && $locale !~ m/\./ && exists 
$supported_by->{$locale}) {
                print_warning("WARNING! An ambiguous locale is currently in 
effect: $locale\n");
                my $utility;
                if (-d '/run/systemd') {

Reply via email to