From b9484b4f1956b8bb891dd08d75b775f3cb0846f8 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 13 Aug 2003 16:23:29 +0000
Subject: fixed with_hdlist possibly incorrect.

---
 perl-install/install_any.pm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e5e7eba07..630b19945 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -544,10 +544,21 @@ sub install_urpmi {
 	    my ($qname, $qdir) = ($name, $dir);
 	    $qname =~ s/(\s)/\\$1/g; $qdir =~ s/(\s)/\\$1/g;
 
+	    #- compute correctly reference to Mandrake/base
+	    my $with;
+	    if ($_->{update}) {
+		#- an update medium always use "../base/hdlist.cz";
+		$with = "../base/hdlist.cz";
+	    } else {
+		$with = $_->{rpmsdir};
+		$with =~ s|/+|/|g; $with =~ s|/$||; $with =~ s|[^/]||g; $with =~ s|/|../|g;
+		$with .= "Mandrake/base/$_->{hdlist}";
+	    }
+
 	    #- output new urpmi.cfg format here.
 	    push @cfg, "$qname " . ($need_list ? "" : $qdir) . " {
   hdlist: hdlist.$name.cz
-  with_hdlist: ../base/" . ($_->{update} ? "hdlist.cz" : $_->{hdlist}) . ($need_list ? "
+  with_hdlist: $with" . ($need_list ? "
   list: list.$name" : "") . ($dir =~ /removable:/ && "
   removable: /dev/cdrom") . "
   update" . "
-- 
cgit v1.2.1