From d3049ca80bf1f48134e5bddbb1349276fdcfc3c4 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 12 Sep 2002 14:03:18 +0000
Subject: 4.0-17mdk

---
 skip.list               | 3 +++
 urpm/parallel_ka_run.pm | 4 ++--
 urpm/parallel_ssh.pm    | 4 ++--
 urpmi.spec              | 6 +++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/skip.list b/skip.list
index c6bf7132..ed3c6736 100644
--- a/skip.list
+++ b/skip.list
@@ -1 +1,4 @@
 # Here you can specify the package you don't want to install
+# by default apache2-conf is added due to obsoletes of package of
+# the main distro which cause it to be selected.
+apache2-conf
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index f1d1f775..4d44e2ac 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -98,8 +98,8 @@ sub parallel_install {
 
     local (*F, $_);
     my ($node, %bad_nodes);
-    $urpm->{log}("parallel_ka_run: rshp -v $parallel->{options} -- urpmi --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}");
-    open F, "rshp -v $parallel->{options} -- urpmi --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line} |";
+    $urpm->{log}("parallel_ka_run: rshp -v $parallel->{options} -- urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}");
+    open F, "rshp -v $parallel->{options} -- urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line} |";
     while (defined ($_ = <F>)) {
 	chomp;
 	s/<([^>]*)>.*:->:(.*)/$2/ and $node = $1;
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index db908add..22c3570e 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -104,8 +104,8 @@ sub parallel_install {
     my %bad_nodes;
     foreach my $node (keys %{$parallel->{nodes}}) {
 	local (*F, $_);
-	$urpm->{log}("parallel_ssh: ssh $node urpmi --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}");
-	open F, "ssh $node urpmi --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line} |";
+	$urpm->{log}("parallel_ssh: ssh $node urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}");
+	open F, "ssh $node urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line} |";
 	while ($_ = <F>) {
 	    $bad_nodes{$node} .= $_;
 	    /Installation failed/ and $bad_nodes{$node} = '';
diff --git a/urpmi.spec b/urpmi.spec
index ecd110c9..52e12f0a 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.0
-Release: 16mdk
+Release: 17mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -202,6 +202,10 @@ fi
 
 
 %changelog
+* Thu Sep 12 2002 François Pons <fpons@mandrakesoft.com> 4.0-17mdk
+- fixed possible no clean of distributed module.
+- added apache2-conf to skip.list by default.
+
 * Wed Sep 11 2002 François Pons <fpons@mandrakesoft.com> 4.0-16mdk
 - improved ka-run distributed module to copy all files with one
   invocation (newly supported in ka-run-2.0-15mdk).
-- 
cgit v1.2.1