From a982d562a19e1bf9d421cc64127635e403dd3f39 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 26 Mar 2000 17:24:04 +0000
Subject: no_comment

---
 urpmi.addmedia | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'urpmi.addmedia')

diff --git a/urpmi.addmedia b/urpmi.addmedia
index 468e675d..be89cdf1 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -86,7 +86,13 @@ my $RPMLIST = "$DIR/list.$name";
 !-e $HDLIST || unlink $HDLIST or die "can't remove $HDLIST";
 
 if (my ($prefix, $dir) = $url =~ m,^(removable_.*?|file):/(.*),) {
-    if (-e (my $f = "$dir/Mandrake/base/hdlist.cz2")) {
+    my $f;
+    if ($dir =~ /RPMS(.*)$/) {
+	$f = "$dir/Mandrake/base/hdlist$1.cz2";
+	$f = "$dir/../base/hdlist$1.cz2" unless -e $f;
+	$f = "$dir/../hdlist$1.cz2" unless -e $f;
+    }
+    if (-e $f) {
 	system("cp -f $f $HDLIST");
     } else {
 	system("genhdlist_cz2 -o $HDLIST $dir");
-- 
cgit v1.2.1