From bc5be8ae6923c0605df687918b35a77a735b1b35 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Sep 2000 13:06:05 +0000
Subject: no_comment

---
 perl-install/install_any.pm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e0f3475cd..86afd29b9 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -63,11 +63,7 @@ sub changeMedium($$) {
 }
 sub relGetFile($) {
     local $_ = $_[0];
-    m,^(Mandrake|lnx4win)/, and return $_;
-    /\.img$/ and return "images/$_";
-    my $dir = m|/| ? "Mandrake/mdkinst" : /^(?:compss|compssList|compssUsers|provides|filelist|depslist.*|hdlist.*|auto_inst.*)$/ ?
-      "Mandrake/base/": "$::o->{packages}[2]{$asked_medium}{rpmsdir}/";
-    "$dir$_";
+    m|\.rpm$| ? "$::o->{packages}[2]{$asked_medium}{rpmsdir}/$_" : $_;
 }
 sub askChangeMedium($$) {
     my ($method, $medium) = @_;
@@ -541,7 +537,7 @@ sub loadO {
     my ($O, $f) = @_; $f ||= auto_inst_file;
     my $o;
     if ($f =~ /^(floppy|patch)$/) {
-	my $f = $f eq "floppy" ? "auto_inst.cfg" : "patch";
+	my $f = $f eq "floppy" ? 'Mandrake/base/auto_inst.cfg' : "patch";
 	unless ($::testing) {
 	    fs::mount(devices::make("fd0"), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
 	    $f = "/mnt/$f";
-- 
cgit v1.2.1