ca1311b4b1
All the patches imported from debian source packages are marked accordingly. (From OE-Core rev: 071d2142a134d1c5d39b6fedbf0e68651245581d) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
57 lines
2 KiB
Diff
57 lines
2 KiB
Diff
Upstream-Status:Inappropriate [debian patches]
|
|
From 718e9cbd59f0739fc9104af111e42fff66f927a7 Mon Sep 17 00:00:00 2001
|
|
From: Niko Tyni <ntyni@debian.org>
|
|
Date: Sun, 3 Oct 2010 21:36:17 +0300
|
|
Subject: Squelch locale warnings in Debian package maintainer scripts
|
|
|
|
Bug-Debian: http://bugs.debian.org/508764
|
|
|
|
The system locales are rather frequently out of sync with the C library
|
|
during package upgrades, causing a huge amount of useless Perl locale
|
|
warnings. Squelch them when running package maintainer scripts, detected
|
|
by the DPKG_RUNNING_VERSION environment variable.
|
|
|
|
Any real locale problem will show up after the system upgrade too, and
|
|
the warning will be triggered normally again at that point.
|
|
|
|
Patch-Name: debian/squelch-locale-warnings.diff
|
|
---
|
|
locale.c | 4 ++++
|
|
pod/perllocale.pod | 8 ++++++++
|
|
2 files changed, 12 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/locale.c b/locale.c
|
|
index 4631b86..94a0962 100644
|
|
--- a/locale.c
|
|
+++ b/locale.c
|
|
@@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
|
|
char *p;
|
|
const bool locwarn = (printwarn > 1 ||
|
|
(printwarn &&
|
|
+
|
|
+ /* Debian specific change - see http://bugs.debian.org/508764 */
|
|
+ (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) &&
|
|
+
|
|
(!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
|
|
|
|
if (locwarn) {
|
|
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
|
|
index 8926d8b..6c55889 100644
|
|
--- a/pod/perllocale.pod
|
|
+++ b/pod/perllocale.pod
|
|
@@ -861,6 +861,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message.
|
|
The message tells about some problem in your system's locale support,
|
|
and you should investigate what the problem is.
|
|
|
|
+=item DPKG_RUNNING_VERSION
|
|
+
|
|
+On Debian systems, if the DPKG_RUNNING_VERSION environment variable is
|
|
+set (to any value), the locale failure warnings will be suppressed just
|
|
+like with a zero PERL_BADLANG setting. This is done to avoid floods
|
|
+of spurious warnings during system upgrades.
|
|
+See L<http://bugs.debian.org/508764>.
|
|
+
|
|
=back
|
|
|
|
The following environment variables are not specific to Perl: They are
|