From 478632060840a9dd32a64325d59819bd2025217a Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Mon, 18 Dec 2000 19:44:34 +0000
Subject: corrected bad mergeinconf

---
 perl-install/modules.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.1