summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-12-18 19:44:34 +0000
committerdamien <damien@mandriva.com>2000-12-18 19:44:34 +0000
commit478632060840a9dd32a64325d59819bd2025217a (patch)
treede0c080025c06bb413e9e562406570d4e725addf /perl-install
parentcd67553b186a4070712cf5fe6a2c76f5bb5e6552 (diff)
downloaddrakx-backup-do-not-use-478632060840a9dd32a64325d59819bd2025217a.tar
drakx-backup-do-not-use-478632060840a9dd32a64325d59819bd2025217a.tar.gz
drakx-backup-do-not-use-478632060840a9dd32a64325d59819bd2025217a.tar.bz2
drakx-backup-do-not-use-478632060840a9dd32a64325d59819bd2025217a.tar.xz
drakx-backup-do-not-use-478632060840a9dd32a64325d59819bd2025217a.zip
corrected bad mergeinconf
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index dfdebd6cd..e41a29bd1 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -544,8 +544,11 @@ sub read_conf($;$) {
sub mergein_conf {
my ($file) = @_;
+#- add2hash(\%conf, read_conf($file, \$scsi));
my $modconfref = read_conf ($file, \$scsi);
- map { my ($key, $value) = $_; $conf{$key}{alias} ||= $value->{alias} } %$modconfref;
+ while (my ($key, $value) = each %$modconfref) {
+ $conf{$key}{alias} = $value->{alias} unless exists $conf{$key}{alias};
+ }
}
sub write_conf {