summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-06-05 16:43:09 +0000
committerThierry Vignaud <tv@mandriva.org>2010-06-05 16:43:09 +0000
commit35070d3cb29bd477e9ab6d3b57e66f0e50309e09 (patch)
tree2b3478f95d00e52cb2413633f36e368d39568470
parent901660090890305fd1db8e3dddc22d41ef153b04 (diff)
downloaddrakx-35070d3cb29bd477e9ab6d3b57e66f0e50309e09.tar
drakx-35070d3cb29bd477e9ab6d3b57e66f0e50309e09.tar.gz
drakx-35070d3cb29bd477e9ab6d3b57e66f0e50309e09.tar.bz2
drakx-35070d3cb29bd477e9ab6d3b57e66f0e50309e09.tar.xz
drakx-35070d3cb29bd477e9ab6d3b57e66f0e50309e09.zip
fix translating reasons for 2nd stage warning when we change the driver
(warning: needs further fix in notify-x11-free-driver-switch for UTF-8 encoding of the cat_()ed message)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake10
2 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4ceaaaba6..77d80b645 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- harddrake:
+ o fix translating reasons for 2nd stage warning
- localedrake:
o fix listing locales only providing UTF8 metadata (#59634, Herton
Ronaldo Krzesinski)
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 761ea8a46..61dabe2af 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -7,6 +7,14 @@ BEGIN { $ENV{DISABLE_DRAKBUG} = 1 }
use strict;
use diagnostics;
+
+# fix translating reasons for 2nd stage warning
+use lang;
+BEGIN {
+ my $locale = lang::read($>);
+ lang::set($locale);
+}
+
use standalone; #- warning, standalone must be loaded very first, for 'explanations'
use c;
use common;
@@ -63,6 +71,8 @@ if (!member($curr_kernel, chomp_(cat_($known_kernels)))) {
harddrake::autoconf::fix_aliases($modules_conf) if !$first_run;
append_to_file($known_kernels, "$curr_kernel\n");
}
+use Data::Dumper;
+output('/tmp/env.pl', Dumper(\%ENV));
sub get_xorg_driver() {