fixed to build an inflexion point in list file (so that urpmi can found it).

1 files changed, 6 insertions, 5 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 8c3978930..6d8d2f432 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -519,9 +519,9 @@ sub install_urpmi {
 		    #- WARNING this method of build only works because synthesis (or hdlist)
 		    #-         has been read.
 		    foreach (@{$packages->{depslist}}[$_->{start} .. $_->{end}]) {
-			my $ldir = $dir;
 			my $arch = $_->arch;
-			$ldir =~ s/%{ARCH}/$arch/g;
+			my $ldir = $dir;
+			$ldir =~ s|/([^/]*)%{ARCH}|/./$1$arch|; $ldir =~ s|%{ARCH}|$arch|g;
 			print $LIST "$ldir/".$_->filename."\n";
 		    }
 		} else {
@@ -529,9 +529,9 @@ sub install_urpmi {
 		    open(my $F, "parsehdlist '$prefix/var/lib/urpmi/hdlist.$name.cz' |");
 		    local $_; 
 		    while (<$F>) {
-			my $ldir = $dir;
 			my $arch = $_->arch;
-			$ldir =~ s/%{ARCH}/$arch/g;
+			my $ldir = $dir;
+			$ldir =~ s|/([^/]*)%{ARCH}|/./$1$arch|; $ldir =~ s|%{ARCH}|$arch|g;
 			print $LIST "$ldir/$_";
 		    }
 		    close $F;
@@ -557,8 +557,9 @@ sub install_urpmi {
 		$with = "../base/hdlist.cz";
 	    } else {
 		$with = $_->{rpmsdir};
+		$with =~ s|/[^/]*%{ARCH}.*||;
 		$with =~ s|/+|/|g; $with =~ s|/$||; $with =~ s|[^/]||g; $with =~ s|/|../|g;
-		$with .= "Mandrake/base/$_->{hdlist}";
+		$with .= "../Mandrake/base/$_->{hdlist}";
 	    }
 
 	    #- output new urpmi.cfg format here.