summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-08-09 12:21:13 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-08-09 12:21:13 +0000
commit2af7c0dcd34e6ac23ac3bf663997f24922431a79 (patch)
treead31d209ba35657382d684544fe83125c2c408da /perl-install/modules.pm
parent6fc2fb62603cc5a653595337db7176f3b83a8b44 (diff)
downloaddrakx-2af7c0dcd34e6ac23ac3bf663997f24922431a79.tar
drakx-2af7c0dcd34e6ac23ac3bf663997f24922431a79.tar.gz
drakx-2af7c0dcd34e6ac23ac3bf663997f24922431a79.tar.bz2
drakx-2af7c0dcd34e6ac23ac3bf663997f24922431a79.tar.xz
drakx-2af7c0dcd34e6ac23ac3bf663997f24922431a79.zip
mergein_conf: return options if they're set
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index b72de2053..8024d1c3d 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -209,6 +209,7 @@ sub mergein_conf {
my $modconfref = read_conf($file);
while (my ($key, $value) = each %$modconfref) {
$conf{$key}{alias} = $value->{alias} if !exists $conf{$key}{alias};
+ $conf{$key}{options} = $value->{options} if $value->{options};
push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall});
}
}