From e02dd188820803e2c1deffe311de9cca17696072 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 13 Aug 2009 10:11:24 +0000
Subject: don't add useless install lines in modprobe.conf

---
 perl-install/NEWS                     | 1 +
 perl-install/modules/modprobe_conf.pm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 761cba3aa..da40bd96c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,7 @@
 - localedrake
   o add "English (South Africa)" (#51057)
 - fix window creation (#52812)
+- don't add useless install lines in modprobe.conf
 
 Version 12.43 - 10 August 2009 
 
diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm
index 76f3fbee0..e0169ecf4 100644
--- a/perl-install/modules/modprobe_conf.pm
+++ b/perl-install/modules/modprobe_conf.pm
@@ -25,8 +25,9 @@ sub get_above {
 }
 sub set_above {
     my ($conf, $module, $o_modules) = @_;
+    return unless $o_modules;
     $module = $conf->mapping($module);
-    my @modules = $conf->mapping(split(' ', $o_modules || ''));
+    my @modules = $conf->mapping(split(' ', $o_modules));
 
     { #- first add to "install" command
 	my ($before, $after) = parse_non_virtual($module, $conf->{$module}{install});
-- 
cgit v1.2.1