summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm/parallel_ka_run.pm10
-rw-r--r--urpmi.spec5
2 files changed, 10 insertions, 5 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index 92f5aedf..2b2bb0ba 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -3,6 +3,7 @@ package urpm::parallel_ka_run;
#- parallel resolve_dependencies
sub parallel_resolve_dependencies {
my ($parallel, $synthesis, $urpm, $state, $requested, %options) = @_;
+ my (%avoided, %requested);
#- first propagate the synthesis file to all machine.
$urpm->{log}("parallel_ka_run: mput $parallel->{options} -- '$synthesis' '$synthesis'");
@@ -53,7 +54,7 @@ sub parallel_resolve_dependencies {
#- now try an iteration of urpmq.
$urpm->{log}("parallel_ka_run: rshp -v $parallel->{options} -- urpmq --synthesis $synthesis -f $line ".join(' ', keys %chosen));
open F, "rshp -v $parallel->{options} -- urpmq --synthesis $synthesis -fdu $line ".join(' ', keys %chosen)." |";
- while ($_ = <F>) {
+ while (defined ($_ = <F>)) {
chomp;
s/<([^>]*)>.*:->:(.*)/$2/ and $node = $1;
if (/\|/) {
@@ -102,12 +103,13 @@ sub parallel_install {
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} |";
- while ($_ = <F>) {
+ while (defined ($_ = <F>)) {
chomp;
s/<([^>]*)>.*:->:(.*)/$2/ and $node = $1;
$bad_nodes{$node} .= $_;
+ /^\s*$/ and next;
/Installation failed/ and $bad_nodes{$node} = '';
- /Installation is possible/ and delete $bad_nodes{$node}, last;
+ /Installation is possible/ and delete $bad_nodes{$node};
}
close F or $urpm->{fatal}(1, _("rshp failed"));
@@ -119,7 +121,7 @@ sub parallel_install {
#- continue installation.
$urpm->{log}("parallel_ka_run: rshp $parallel->{options} -- urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}");
- system "rshp $parallel->{options} -- urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}" == 0;
+ system("rshp $parallel->{options} -- urpmi --no-locales --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}") == 0;
}
diff --git a/urpmi.spec b/urpmi.spec
index fa8d1795..57119aa5 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.0
-Release: 13mdk
+Release: 14mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -202,6 +202,9 @@ fi
%changelog
+* Fri Sep 6 2002 François Pons <fpons@mandrakesoft.com> 4.0-14mdk
+- fixed ka-run distributed module.
+
* Thu Sep 5 2002 François Pons <fpons@mandrakesoft.com> 4.0-13mdk
- simplified --proxy usage (http:// leading now optional).
- fixed --proxy and --proxy-user or urpmq.