From 0756f81db4bc8da0f5d5fd149d448a95e43535bf Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 20 Apr 2009 15:30:12 +0000
Subject: (_install_raw,monitor_full_edid) do not log perl warnings about
 missing/not-yet-installed locales while installing and while probing EDID

---
 perl-install/any.pm          | 10 +++++++---
 perl-install/install/NEWS    |  3 +++
 perl-install/install/pkgs.pm |  3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 634dbf9f4..472db55c7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1294,9 +1294,13 @@ sub monitor_full_edid() {
 
     devices::make('zero');
     my ($vbe, $edid);
-    run_program::raw({ timeout => 20 }, 
-		     'monitor-edid', '>', \$edid, '2>', \$vbe, 
-		     '-v', '--perl', if_($::isStandalone, '--try-in-console'));
+    {
+        # prevent warnings in install's logs:
+        local $ENV{LC_ALL} = 'C';
+        run_program::raw({ timeout => 20 }, 
+                         'monitor-edid', '>', \$edid, '2>', \$vbe, 
+                         '-v', '--perl', if_($::isStandalone, '--try-in-console'));
+    }
     if ($::isInstall) {
 	foreach (['edid', \$edid], ['vbe', \$vbe]) {
 	    my ($name, $val) = @$_;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b327194f4..8ef7f7eaa 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not log perl warnings about missing/not-yet-installed locales
+  while installing and while probing EDID
+
 Version 12.28.1 - 16 April 2009
 
 - diskdrake:
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index c933cfd56..74b585210 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -728,6 +728,9 @@ sub is_package_installed {
 sub _install_raw {
     my ($packages, $isUpgrade, $callback, $LOG, $noscripts) = @_;
 
+    # prevent warnings in install's logs:
+    local $ENV{LC_ALL} = 'C';
+
     # let's be urpmi's compatible:
     local $packages->{options}{noscripts} = $noscripts;
     # leaks a fd per transaction (around ~100 for a typically gnome install, see #49097):
-- 
cgit v1.2.1