[Pkg-shadow-devel] [Git][debian/adduser][master] 4 commits: call textdomain fully qualified. Import function explicitly

[Marc Haber (@zugschlus)]

Marc Haber pushed to branch master at Debian / adduser


Commits:
fa222f56 by Marc Haber at 2025-02-22T22:09:27+01:00
call textdomain fully qualified. Import function explicitly

Thanks: Yuri Konotopov, Christian Weeks
Closes: #1098692, #1098690

- - - - -
3d7fea9e by Marc Haber at 2025-02-22T22:10:42+01:00
don't initialize $encode_loaded

It gets initialized in BEGIN
Git-Dch: ignore

- - - - -
0d92ab62 by Marc Haber at 2025-02-22T22:11:09+01:00
only set binmode if Encode is loaded in deluser

- - - - -
54aafba7 by Marc Haber at 2025-02-22T22:13:29+01:00
changelog for upload

Git-Dch: ignore

- - - - -


5 changed files:

- AdduserCommon.pm
- AdduserLogging.pm
- adduser
- debian/changelog
- deluser


Changes:

=====================================
AdduserCommon.pm
=====================================
@@ -65,13 +65,14 @@ BEGIN {
     local $ENV{PERL_DL_NONLAZY}=1;
     eval {
         require Locale::gettext;
+        Locale::gettext->import(qw(gettext textdomain LC_MESSAGES));
     };
     if ($@) {
         *gettext = sub { shift };
         *textdomain = sub { "" };
         *LC_MESSAGES = sub { 5 };
     } else {
-        textdomain("adduser");
+        Locale::gettext::textdomain("adduser");
     }
 }
 


=====================================
AdduserLogging.pm
=====================================
@@ -23,13 +23,14 @@ BEGIN {
     local $ENV{PERL_DL_NONLAZY}=1;
     eval {
         require Locale::gettext;
+        Locale::gettext->import(qw(gettext textdomain LC_MESSAGES));
     };
     if ($@) {
         *gettext = sub { shift };
         *textdomain = sub { "" };
         *LC_MESSAGES = sub { 5 };
     } else {
-        textdomain(progname());
+        Locale::gettext::textdomain("adduser");
     }
 }
 


=====================================
adduser
=====================================
@@ -39,7 +39,7 @@ BEGIN {
 }
 
 my $version = "DVERSION";
-my $encode_loaded = 0;
+my $encode_loaded;
 my $codeset;
 
 BEGIN {


=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-adduser (3.141~) UNRELEASED; urgency=medium
+adduser (3.141) unstable; urgency=medium
 
-  * NOT YET RELEASED
+  * add new autopktest to check adduser basic functionality.
+  * README: Document adduser behavior in minimal chroots
+  * call textdomain fully qualified. Import function explicitly.
+    Thanks to Yuri Konotopov, Christian Weeks (Closes: #1098692, #1098690)
+  * only set binmode if Encode is loaded in deluser
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 22 Feb 2025 09:59:25 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 22 Feb 2025 22:11:35 +0100
 
 adduser (3.140) unstable; urgency=medium
 


=====================================
deluser
=====================================
@@ -37,7 +37,7 @@ BEGIN {
 }
 
 my $version = "DVERSION";
-my $encode_loaded = 0;
+my $encode_loaded;
 my $codeset;
 
 my $install_more_packages;
@@ -93,8 +93,10 @@ BEGIN {
 }
 
 my $charset = langinfo($codeset);
-binmode(STDOUT, ":encoding($charset)");
-binmode(STDERR, ":encoding($charset)");
+if ($encode_loaded) {
+    binmode(STDOUT, ":encoding($charset)");
+    binmode(STDERR, ":encoding($charset)");
+}
 
 our $action;
 our $verbose;



View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/cc89d9c56d832ab267c7fb41ce2f85c738487504...54aafba762f63329e651e2c9a7b6456f806f06ab

-- 
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/cc89d9c56d832ab267c7fb41ce2f85c738487504...54aafba762f63329e651e2c9a7b6456f806f06ab
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/20250222/60e835f4/attachment-0001.htm>