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

[Kerin Millar]

commit:     3af4958ce2c766534909c93a94a4003d10214a3c
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Mon Jan  5 03:47:02 2026 +0000
Commit:     Kerin Millar <kfm <AT> plushkava <DOT> net>
CommitDate: Mon Jan  5 03:47:02 2026 +0000
URL:        https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=3af4958c

Shorten the diagnostic messages pertaining to SELinux

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

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

diff --git a/locale-gen b/locale-gen
index 0a61ee8..3762076 100644
--- a/locale-gen
+++ b/locale-gen
@@ -591,12 +591,12 @@ sub install_archive ($src_path, $dst_path, 
$may_reset_labels) {
                print "The filesystem is mounted with support for SELinux 
security labels.\n";
        }
        if ($has_seclabels && $has_archive) {
-               my $action = 'copy the security context of the previous 
archive';
+               my $action = 'copying the security context of the previous 
archive';
                if (can_run('chcon')) {
-                       print "Attempting to $action ...\n";
+                       print ucfirst $action, " ...\n";
                        copy_security_context($dst_path, $interim_path);
                } else {
-                       print_warning("Not attempting to $action because 
chcon(1) is unavailable.\n");
+                       print_warning("Not $action because chcon(1) is 
unavailable.\n");
                }
        }
 
@@ -607,12 +607,12 @@ sub install_archive ($src_path, $dst_path, 
$may_reset_labels) {
 
        # If no prior archive existed, restore the appropriate SELinux label.
        if ($has_seclabels && ! $has_archive && $may_reset_labels) {
-               my $action = 'restore the default security context of the 
archive';
+               my $action = 'restoring the default security context of the 
archive';
                if (can_run('restorecon')) {
-                       print "Attempting to $action ...\n";
+                       print ucfirst $action, " ...\n";
                        run('restorecon', '-Fmv', '--', $dst_path);
                } else {
-                       print_warning("Not attempting to $action because 
restorecon(8) is unavailable.\n");
+                       print_warning("Not $action because restorecon(8) is 
unavailable.\n");
                }
        }