summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-19 19:42:23 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-19 19:42:23 +0000
commite592a152566d32dc2c33faecf57a10ae01b02055 (patch)
treec01641d0c536124f2f7700a8e13fe18c9abe5bed
parent8124d99639f34e85cbda60ab1e2e13100849fb88 (diff)
downloaddrakx-e592a152566d32dc2c33faecf57a10ae01b02055.tar
drakx-e592a152566d32dc2c33faecf57a10ae01b02055.tar.gz
drakx-e592a152566d32dc2c33faecf57a10ae01b02055.tar.bz2
drakx-e592a152566d32dc2c33faecf57a10ae01b02055.tar.xz
drakx-e592a152566d32dc2c33faecf57a10ae01b02055.zip
fix passing module options when module name contains a '-' character
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/modules.pm5
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1cc8de77c..03923370a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- stop configuring TV cards in summary since kernel do a better job now
+- fix passing module options when module name contains a '-' character
Version 10.4.204 - 19 September 2007, by Pascal "Pixel" Rigaux
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 83410dfd6..f86aab09a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -96,7 +96,8 @@ sub load_with_options {
@l = remove_loaded_modules(@l) or return;
- load_raw(\@l, $h_options);
+ my %options = map { cond_mapping_24_26($_) => $h_options->{$_} } keys %$h_options;
+ load_raw(\@l, \%options);
}
sub load {
my (@l) = @_;
@@ -108,7 +109,7 @@ sub load_and_configure {
my ($conf, $module, $o_options) = @_;
my @l = remove_loaded_modules(dependencies_closure(cond_mapping_24_26($module)));
- load_raw(\@l, { $module => $o_options });
+ load_raw(\@l, { cond_mapping_24_26($module) => $o_options });
if (member($module, 'imm', 'ppa')
&& ! -d "/proc/sys/dev/parport/parport0/devices/$module") {