summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-03 16:17:20 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-03 16:17:20 +0000
commitb31446a81d5ec395245290737410e866f82d0976 (patch)
tree3a0eb363985be57a88b0bae2ff1f80055c588f8b
parent38a02aed867415b1e5bd3586e28bb18c1f5a2b9c (diff)
downloaddrakx-backup-do-not-use-b31446a81d5ec395245290737410e866f82d0976.tar
drakx-backup-do-not-use-b31446a81d5ec395245290737410e866f82d0976.tar.gz
drakx-backup-do-not-use-b31446a81d5ec395245290737410e866f82d0976.tar.bz2
drakx-backup-do-not-use-b31446a81d5ec395245290737410e866f82d0976.tar.xz
drakx-backup-do-not-use-b31446a81d5ec395245290737410e866f82d0976.zip
(parameters) fix modinfo parsing (format had been altered between
modutils and module-init-tools :-()
-rw-r--r--perl-install/modules/parameters.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/modules/parameters.pm b/perl-install/modules/parameters.pm
index d6338f8e1..66590f7d8 100644
--- a/perl-install/modules/parameters.pm
+++ b/perl-install/modules/parameters.pm
@@ -21,7 +21,11 @@ sub parameters {
foreach (common::join_lines(run_program::get_stdout('modinfo', '-p', $module))) {
chomp;
next if /^warning:/;
- (my $name, $_) = /(\S+)\s+(.*)/s or warn "modules::parameters::get_options_name($module): unknown line\n";
+ (my $name, $_) = /(\w+)(?::|\s+)(.*)/s or warn "modules::parameters::get_options_name($module): unknown line\n";
+ if (c::kernel_version() =~ /^\Q2.6/) {
+ push @parameters, [ $name, '', $_ ];
+ next;
+ }
my $c_types = 'int|string|short|byte|char|long';
my ($is_a_number, $description, $min, $max) = (0, '', 1, 1);