[gentoo-commits] proj/locale-gen:master commit in: /

[Kerin Millar]

commit:     e7a9bc6678785031aed471f62682f42ad9de75d7
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Tue Oct 28 15:51:43 2025 +0000
Commit:     Kerin Millar <kfm <AT> plushkava <DOT> net>
CommitDate: Tue Oct 28 16:53:05 2025 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=e7a9bc66

Rename the @canonicals parameter to @names

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

 locale-gen | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale-gen b/locale-gen
index da6565a..2927dec 100644
--- a/locale-gen
+++ b/locale-gen
@@ -511,7 +511,7 @@ sub compile_locale ($locale, $charmap, $name) {
        run('localedef', '--no-archive', '-i', $locale, '-f', $charmap, '--', 
$output_dir);
 }
 
-sub generate_archive ($gentoo_prefix, $locale_dir, $prior_archive, 
@canonicals) {
+sub generate_archive ($gentoo_prefix, $locale_dir, $prior_archive, @names) {
        # Create the temporary subdir that will contain the new locale archive.
        my $output_dir = catdir('.', $gentoo_prefix, $locale_dir);
        run('mkdir', '-p', '--', $output_dir);
@@ -522,14 +522,14 @@ sub generate_archive ($gentoo_prefix, $locale_dir, 
$prior_archive, @canonicals)
        }
 
        # Integrate all of the compiled locales into the new locale archive.
-       my $total = scalar @canonicals;
+       my $total = scalar @names;
        printf "Adding %d locale%s to the locale archive ...\n", $total, 
plural($total);
        my $stderr;
        if (! defined(my $pid = open my $pipe, '-|')) {
                die "Can't fork: $!";
        } elsif ($pid == 0) {
                open *STDERR, '>&=', *STDOUT or die "Can't direct STDERR to 
STDOUT: $!\n";
-               run(qw( localedef --prefix . --quiet --add-to-archive -- ), 
@canonicals);
+               run(qw( localedef --prefix . --quiet --add-to-archive -- ), 
@names);
        } else {
                local $/;
                $stderr = readline $pipe;