summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-16 23:09:00 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-16 23:09:00 +0000
commit856e7d6ea668ba70d4bcea9876d991c634400747 (patch)
treeba789fc1049c90f28ebd94f2c96ce0d2841a6bc8
parent06d8a567c68a54842c2bbf35fcbf677655c3ece3 (diff)
downloaddrakx-backup-do-not-use-856e7d6ea668ba70d4bcea9876d991c634400747.tar
drakx-backup-do-not-use-856e7d6ea668ba70d4bcea9876d991c634400747.tar.gz
drakx-backup-do-not-use-856e7d6ea668ba70d4bcea9876d991c634400747.tar.bz2
drakx-backup-do-not-use-856e7d6ea668ba70d4bcea9876d991c634400747.tar.xz
drakx-backup-do-not-use-856e7d6ea668ba70d4bcea9876d991c634400747.zip
make modules::*::get_above return a list, and thus fix loading of tifm_sd module during install
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/modules.pm4
-rw-r--r--perl-install/modules/modprobe_conf.pm2
-rw-r--r--perl-install/modules/modules_conf.pm2
4 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 04155ecbf..216d0bfb1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix loading of tifm_sd module
+
Version 10.4.198 - 16 September 2007, by Thierry Vignaud
- fix a crash
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 141b509e5..3c67474b6 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -256,8 +256,8 @@ sub when_load {
when_load_category($conf, $name, $category);
}
- if (my $above = $conf->get_above($name)) {
- load($above); #- eg: for snd-pcm-oss set by set_sound_slot()
+ if (my @above = $conf->get_above($name)) {
+ load(@above); #- eg: for snd-pcm-oss set by set_sound_slot()
}
}
diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm
index b2a57717d..76f3fbee0 100644
--- a/perl-install/modules/modprobe_conf.pm
+++ b/perl-install/modules/modprobe_conf.pm
@@ -21,7 +21,7 @@ sub get_above {
my (undef, $after) = parse_non_virtual($module, $conf->{$module}{install}) or return;
my ($l, $_other_cmds) = partition_modprobes($after);
- join(' ', @$l);
+ @$l;
}
sub set_above {
my ($conf, $module, $o_modules) = @_;
diff --git a/perl-install/modules/modules_conf.pm b/perl-install/modules/modules_conf.pm
index afcf08b35..2bfc2ce65 100644
--- a/perl-install/modules/modules_conf.pm
+++ b/perl-install/modules/modules_conf.pm
@@ -19,7 +19,7 @@ sub get_above {
my ($conf, $module) = @_;
$module = $conf->mapping($module);
- $conf->{$module} && $conf->{$module}{above};
+ $conf->{$module} && split(' ', $conf->{$module}{above});
}
sub set_above {
my ($conf, $module, $o_modules) = @_;