From 6a26fb5ff196c6fdcf93d636099607d9c6b900e8 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 29 Aug 2002 13:08:36 +0000
Subject: 4.0-9mdk

---
 urpm.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'urpm.pm')

diff --git a/urpm.pm b/urpm.pm
index 4b19c488..e67dc760 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -591,7 +591,6 @@ sub configure {
 		$_->{ignore} = 1;
 	    }
 	}
-	$options{parallel} and unlink "$urpm->{cachedir}/partial/parallel.cz";
 	foreach (grep { !$_->{ignore} && (!$options{update} || $_->{update}) } @{$urpm->{media} || []}) {
 	    delete @{$_}{qw(start end)};
 	    if ($options{callback}) {
@@ -617,8 +616,6 @@ sub configure {
 		unless (defined $_->{start} && defined $_->{end}) {
 		    $urpm->{error}(_("problem reading synthesis file of medium \"%s\"", $_->{name}));
 		    $_->{ignore} = 1;
-		} else {
-		    $options{parallel} and system "cat '$urpm->{statedir}/synthesis.$_->{hdlist}' >> $urpm->{cachedir}/partial/parallel.cz";
 		}
 	    }
 	}
@@ -1638,8 +1635,15 @@ sub resolve_dependencies {
     require URPM::Resolve;
 
     if ($urpm->{parallel_handler}) {
+	#- build the global synthesis file first.
+	my $file = "$urpm->{cachedir}/partial/parallel.cz";
+	unlink $file;
+	foreach (@{$urpm->{media}}) {
+	    defined $_->{start} && defined $_->{end} or next;
+	    system "cat '$urpm->{statedir}/synthesis.$_->{hdlist}' >> $file";
+	}
 	#- let each node determine what is requested, according to handler given.
-	$urpm->{parallel_handler}->parallel_resolve_dependencies("$urpm->{cachedir}/partial/parallel.cz", @_);
+	$urpm->{parallel_handler}->parallel_resolve_dependencies($file, @_);
     } else {
 	my $db;
 
-- 
cgit v1.2.1