summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-08 07:33:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-08 07:33:11 +0000
commit913f41722b6356ef409be928e18dde003d60872c (patch)
tree2d3899201e238883cc84fd1b87f624d3b04b3e4d /perl-install/modules.pm
parenta9d402da3726f85c3258eb6c494ef8ad8f95d925 (diff)
downloaddrakx-backup-do-not-use-913f41722b6356ef409be928e18dde003d60872c.tar
drakx-backup-do-not-use-913f41722b6356ef409be928e18dde003d60872c.tar.gz
drakx-backup-do-not-use-913f41722b6356ef409be928e18dde003d60872c.tar.bz2
drakx-backup-do-not-use-913f41722b6356ef409be928e18dde003d60872c.tar.xz
drakx-backup-do-not-use-913f41722b6356ef409be928e18dde003d60872c.zip
in mergein_conf(), get the "above" value, and don't dirty "probeall"
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index dfdc52cee..7ee4280f8 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -294,8 +294,9 @@ sub mergein_conf_raw {
my $modconfref = read_conf($file);
while (my ($key, $value) = each %$modconfref) {
$conf{$key}{alias} ||= $value->{alias};
+ $conf{$key}{above} ||= $value->{above};
$conf{$key}{options} = $value->{options} if $value->{options};
- push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall});
+ push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall}) if $value->{probeall};
}
}
sub mergein_conf() {