[Pkg-shadow-devel] [Git][debian/adduser][master] Some minor messages' fixes.

[Marc Haber (@zugschlus)]

Marc Haber pushed to branch master at Debian / adduser


Commits:
c4df5eb7 by Alexander Golubev at 2025-08-14T21:04:50+03:00
Some minor messages' fixes.

- - - - -


2 changed files:

- adduser
- deluser


Changes:

=====================================
adduser
=====================================
@@ -1345,8 +1345,8 @@ sub sanitize_name {
     log_trace("sanitize name %s called. name_regex_var %s, name_regex %s, Now testing all numeric. ", $name, $name_regex_var, $name_regex);
     if ($name =~ qr/^-?[\d]+$/) {
         # this check cannot be turned off
-        log_err( mtx("To avoid ambiguity with numerical UIDs, usernames which
-            resemble numbers or negative numbers are not allowed.") );
+        log_err( mtx("To avoid ambiguity with numerical UIDs, usernames which" .
+            "resemble numbers or negative numbers are not allowed.") );
         exit( RET_INVALID_CHARS_IN_NAME );
     }
 
@@ -1367,10 +1367,10 @@ sub sanitize_name {
     log_trace("sanitize_name testing %s against insane chars %s", $name, def_min_regex);
     if ($name !~ def_min_regex) {
         # this check cannot be turned off
-        log_err( mtx("To avoid problems, the username must not start with a
-            dash, plus sign, or tilde, and it must not contain any of the
-            following: colon, comma, slash, or any whitespace characters
-            including spaces, tabs, and newlines.") );
+        log_err( mtx("To avoid problems, the username must not start with a" .
+            "dash, plus sign, or tilde, and it must not contain any of the" .
+            "following: colon, comma, slash, or any whitespace characters" .
+            "including spaces, tabs, and newlines.") );
         exit( RET_INVALID_CHARS_IN_NAME );
     }
 
@@ -1382,22 +1382,22 @@ sub sanitize_name {
 
     log_trace("sanitize_name checking %s ieee_regex %s", $name, def_ieee_name_regex);
     if ($name !~ def_ieee_name_regex && $name_check_level < 2) {
-        log_err( mtx("To avoid problems, the username should consist only of
-            letters, digits, underscores, periods, at signs and dashes, and
-            not start with a dash (as defined by IEEE Std 1003.1-2001). For
-            compatibility with Samba machine accounts, \$ is also supported
-            at the end of the username.  (Use the `--allow-all-names' option
-            to bypass this restriction.)") );
+        log_err( mtx("To avoid problems, the username should consist only of" .
+            "letters, digits, underscores, periods, at signs and dashes, and" .
+            "not start with a dash (as defined by IEEE Std 1003.1-2001). For" .
+            "compatibility with Samba machine accounts, \$ is also supported" .
+            "at the end of the username.  (Use the `--allow-all-names' option" .
+            "to bypass this restriction.)") );
         exit( RET_INVALID_CHARS_IN_NAME );
     }
 
     if ($name_check_level) {
         log_info( mtx("Allowing use of questionable username.") );
     } else {
-        log_err( mtx("Please enter a username matching the regular expression
-            configured via the %s configuration variable.  Use the
-            `--allow-bad-names' option to relax this check or reconfigure
-            %s in configuration."), $name_regex_var, $name_regex_var );
+        log_err( mtx("Please enter a username matching the regular expression" .
+            "configured via the %s configuration variable.  Use the" .
+            "`--allow-bad-names' option to relax this check or reconfigure" .
+            "%s in configuration."), $name_regex_var, $name_regex_var );
         exit( RET_INVALID_CHARS_IN_NAME );
     }
 


=====================================
deluser
=====================================
@@ -299,7 +299,7 @@ if($action eq "deluser") {
 
     # Warn in any case if you want to remove the root account
     if ((defined($pw_uid)) && ($pw_uid == 0) && (!defined($no_preserve_root)))  {
-        log_fatal( mtx("WARNING: You are just about to delete the root account (uid 0). Usually this is never required as it may render the whole system unusable. If you really want this, call deluser with parameter --no-preserve-root. Stopping now without having performed any action") );
+        log_fatal( mtx("WARNING: You are just about to delete the root account (uid 0). Usually this is never required as it may render the whole system unusable. If you really want this, call deluser with parameter --no-preserve-root. Stopping now without having performed any action.") );
         exit( RET_DONT_REMOVE_ROOT );
     }
 
@@ -430,10 +430,10 @@ if($action eq "deluser") {
         }
     } else {
         if ($config{'system'}) {
-            log_info( mtx("`%s' not executed. Skipping crontab removal. Package `cron' required."),
+            log_info( mtx("`%s' is not executable. Skipping crontab removal. Package `cron' required."),
             '/usr/bin/crontab' );
         } else {
-            log_warn( mtx("`%s' not executed. Skipping crontab removal. Package `cron' required."),
+            log_warn( mtx("`%s' is not executable. Skipping crontab removal. Package `cron' required."),
             '/usr/bin/crontab' );
         }
     }



View it on GitLab: https://salsa.debian.org/debian/adduser/-/commit/c4df5eb760b6be76c4d7ac50b7fa13243795cc34

-- 
View it on GitLab: https://salsa.debian.org/debian/adduser/-/commit/c4df5eb760b6be76c4d7ac50b7fa13243795cc34
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-shadow-devel/attachments/20250814/805836a0/attachment-0001.htm>