summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-12-13 10:35:31 +0000
committerFrancois Pons <fpons@mandriva.com>2002-12-13 10:35:31 +0000
commit663f63199bf2c2216952a675f411237a29f7f661 (patch)
tree9b75f6684524ff6598a633adc1721bda0fc0fa89
parent52dd39ed364b8d82ca418c69c7626d9576138fd5 (diff)
downloadurpmi-663f63199bf2c2216952a675f411237a29f7f661.tar
urpmi-663f63199bf2c2216952a675f411237a29f7f661.tar.gz
urpmi-663f63199bf2c2216952a675f411237a29f7f661.tar.bz2
urpmi-663f63199bf2c2216952a675f411237a29f7f661.tar.xz
urpmi-663f63199bf2c2216952a675f411237a29f7f661.zip
4.1-16mdk
-rw-r--r--urpm.pm2
-rw-r--r--urpm/parallel_ka_run.pm2
-rw-r--r--urpm/parallel_ssh.pm2
-rw-r--r--urpmi.spec6
4 files changed, 8 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 9ae73d46..43a7f1f7 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1626,7 +1626,7 @@ sub register_rpms {
$start <= $id and @requested{($start .. $id)} = (1) x ($id-$start+1);
#- distribute local packages to distant nodes directly in cache of each machine.
- $urpm->{parallel_handler} and $urpm->{parallel_handler}->parallel_register_rpms(@_);
+ @files && $urpm->{parallel_handler} and $urpm->{parallel_handler}->parallel_register_rpms(@_);
%requested;
}
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index 1ce539d9..7fac99b6 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -136,7 +136,7 @@ sub parallel_install {
$urpm->{error}(_("Installation is possible"));
1;
} else {
- my $line = $parallel->{line} . ($options{excludepath} && " --excludepath '$options{excludepath}'");
+ my $line = $parallel->{line} . ($options{excludepath} ? " --excludepath '$options{excludepath}'" : "");
#- continue installation.
$urpm->{log}("parallel_ka_run: rshp $parallel->{options} -- urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $line");
system("rshp $parallel->{options} -- urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $line") == 0;
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index 41edfa39..a135f18a 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -141,7 +141,7 @@ sub parallel_install {
$urpm->{error}(_("Installation is possible"));
1;
} else {
- my $line = $parallel->{line} . ($options{excludepath} && " --excludepath '$options{excludepath}'");
+ my $line = $parallel->{line} . ($options{excludepath} ? " --excludepath '$options{excludepath}'" : "");
#- continue installation on each nodes.
foreach my $node (keys %{$parallel->{nodes}}) {
$urpm->{log}("parallel_ssh: ssh $node urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $line");
diff --git a/urpmi.spec b/urpmi.spec
index 29d70c31..67d3e4c6 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.1
-Release: 15mdk
+Release: 16mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -204,6 +204,10 @@ fi
%changelog
+* Fri Dec 13 2002 Fran�ois Pons <fpons@mandrakesoft.com> 4.1-16mdk
+- fixed warning message from distributed module for local rpms.
+- fixed bad test including a 0 for distributed install.
+
* Wed Dec 11 2002 Fran�ois Pons <fpons@mandrakesoft.com> 4.1-15mdk
- improve speed of urpmf dramatically if no --files (default if
no flags given) nor --description are given.