diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff deleted file mode 100644 index 4964e480c7..0000000000 --- a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | From 487a6d6ada0b08e6a7276520ebc61cd851005e7c Mon Sep 17 00:00:00 2001 | ||
2 | From: Niko Tyni <ntyni@debian.org> | ||
3 | Date: Sun, 3 Oct 2010 21:36:17 +0300 | ||
4 | Subject: Squelch locale warnings in Debian package maintainer scripts | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/508764 | ||
7 | |||
8 | The system locales are rather frequently out of sync with the C library | ||
9 | during package upgrades, causing a huge amount of useless Perl locale | ||
10 | warnings. Squelch them when running package maintainer scripts, detected | ||
11 | by the DPKG_RUNNING_VERSION environment variable. | ||
12 | |||
13 | Any real locale problem will show up after the system upgrade too, and | ||
14 | the warning will be triggered normally again at that point. | ||
15 | |||
16 | Patch-Name: debian/squelch-locale-warnings.diff | ||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | locale.c | 5 ++++- | ||
20 | pod/perllocale.pod | 8 ++++++++ | ||
21 | 2 files changed, 12 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/locale.c b/locale.c | ||
24 | index 7a4a418..fdf911d 100644 | ||
25 | --- a/locale.c | ||
26 | +++ b/locale.c | ||
27 | @@ -674,7 +674,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) | ||
28 | |||
29 | const bool locwarn = (printwarn > 1 | ||
30 | || (printwarn | ||
31 | - && (! bad_lang_use_once | ||
32 | + && | ||
33 | + /* Debian specific change - see http://bugs.debian.org/508764 */ | ||
34 | + (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) && | ||
35 | + (! bad_lang_use_once | ||
36 | || ( | ||
37 | /* disallow with "" or "0" */ | ||
38 | *bad_lang_use_once | ||
39 | diff --git a/pod/perllocale.pod b/pod/perllocale.pod | ||
40 | index 701b422..58cabaf 100644 | ||
41 | --- a/pod/perllocale.pod | ||
42 | +++ b/pod/perllocale.pod | ||
43 | @@ -1217,6 +1217,14 @@ B<NOTE>: C<PERL_BADLANG> only gives you a way to hide the warning message. | ||
44 | The message tells about some problem in your system's locale support, | ||
45 | and you should investigate what the problem is. | ||
46 | |||
47 | +=item DPKG_RUNNING_VERSION | ||
48 | + | ||
49 | +On Debian systems, if the DPKG_RUNNING_VERSION environment variable is | ||
50 | +set (to any value), the locale failure warnings will be suppressed just | ||
51 | +like with a zero PERL_BADLANG setting. This is done to avoid floods | ||
52 | +of spurious warnings during system upgrades. | ||
53 | +See L<http://bugs.debian.org/508764>. | ||
54 | + | ||
55 | =back | ||
56 | |||
57 | The following environment variables are not specific to Perl: They are | ||