From f741b647156ef40cfd06455158172e5fbf69ab24 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 26 Jan 2012 18:58:20 +0000
Subject: (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".
---
 perl-install/install/NEWS | 1 +
 perl-install/modules.pm   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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;
                 '';
             }
-- 
cgit v1.2.1