[2826] (load_raw_install) do not display errors when loading a driver that is

[root-odJJhXpcy38dnm+]

Revision: 2826
Author: tv
Date: 2012-01-26 19:58:20 +0100 (Thu, 26 Jan 2012)
Log Message:
-----------
(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".

Modified Paths:
--------------
drakx/trunk/perl-install/install/NEWS
drakx/trunk/perl-install/modules.pm

Modified: drakx/trunk/perl-install/install/NEWS
===================================================================
--- drakx/trunk/perl-install/install/NEWS 2012-01-26 18:58:17 UTC (rev 2825)
+++ drakx/trunk/perl-install/install/NEWS 2012-01-26 18:58:20 UTC (rev 2826)
@@ -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


Modified: drakx/trunk/perl-install/modules.pm
===================================================================
--- drakx/trunk/perl-install/modules.pm 2012-01-26 18:58:17 UTC (rev 2825)
+++ drakx/trunk/perl-install/modules.pm 2012-01-26 18:58:20 UTC (rev 2826)
@@ -329,7 +329,8 @@
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;
'';
}