summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-26 18:58:20 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-26 18:58:20 +0000
commitf741b647156ef40cfd06455158172e5fbf69ab24 (patch)
treed8ebb160741c5c601700c0b3c821ad0abf7f489c /perl-install
parent68caee60840939324fb811ce131ad21f787d9dcd (diff)
downloaddrakx-f741b647156ef40cfd06455158172e5fbf69ab24.tar
drakx-f741b647156ef40cfd06455158172e5fbf69ab24.tar.gz
drakx-f741b647156ef40cfd06455158172e5fbf69ab24.tar.bz2
drakx-f741b647156ef40cfd06455158172e5fbf69ab24.tar.xz
drakx-f741b647156ef40cfd06455158172e5fbf69ab24.zip
(load_raw_install) do not display errors when loading a driver that is
already loaded (mga#1146) we might just as well refuse to load an already loaded module but I think some modules redo probing when "reloaded".
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/modules.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 772748fba..dee5a8560 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- kill old gtk+ warnings that confuse people
- include back urpmi translations
+- do not display errors when loading a driver that is already loaded (mga#1146)
Version 13.78 - 24 January 2012
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index c431268c6..866ca9e91 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -329,7 +329,8 @@ sub load_raw_install {
my $stdout;
my $rc = run_program::run('/sbin/insmod', '2>', \$stdout, $m, split(' ', $options->{$_}));
log::l(chomp_($stdout)) if $stdout;
- if ($rc) {
+ # if whether we succeeded or module is already loaded:
+ if ($rc || $stdout =~ /: -1 File exists/) {
unlink $m;
'';
}