summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-08-13 10:11:24 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-08-13 10:11:24 +0000
commite02dd188820803e2c1deffe311de9cca17696072 (patch)
tree47d04eb026c56252ba997dba63027325f44a1336 /perl-install
parent7aa9e2a72659ed03d8f33b5493c1477344d68082 (diff)
downloaddrakx-e02dd188820803e2c1deffe311de9cca17696072.tar
drakx-e02dd188820803e2c1deffe311de9cca17696072.tar.gz
drakx-e02dd188820803e2c1deffe311de9cca17696072.tar.bz2
drakx-e02dd188820803e2c1deffe311de9cca17696072.tar.xz
drakx-e02dd188820803e2c1deffe311de9cca17696072.zip
don't add useless install lines in modprobe.conf
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/modules/modprobe_conf.pm3
2 files changed, 3 insertions, 1 deletions
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});