summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 12:05:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 12:05:46 +0000
commitb2d42984a48190b7eeba990096a302d2ce8f263d (patch)
treeefe0e68612eaa1af145a65657d2feb12a079eaa8 /urpm
parent0404e11b2a788856dc738e310982dca789f79974 (diff)
downloadurpmi-b2d42984a48190b7eeba990096a302d2ce8f263d.tar
urpmi-b2d42984a48190b7eeba990096a302d2ce8f263d.tar.gz
urpmi-b2d42984a48190b7eeba990096a302d2ce8f263d.tar.bz2
urpmi-b2d42984a48190b7eeba990096a302d2ce8f263d.tar.xz
urpmi-b2d42984a48190b7eeba990096a302d2ce8f263d.zip
- merge diffs with parallel_ssh
- fix return value (bug introduced during refactoring)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/parallel_ka_run.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index a933d90e..58ec5798 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -74,15 +74,16 @@ sub _run_mput {
sub parallel_install {
my ($parallel, $urpm, undef, $install, $upgrade, %options) = @_;
- copy_to_dir($parallel, $urpm, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms/");
+ copy_to_dir($parallel, $urpm, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms");
- my (%bad_nodes);
+ my %bad_nodes;
$parallel->urpm_popen($urpm, 'urpmi', "--pre-clean --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}", sub {
my ($node, $s) = @_;
$s =~ /^\s*$/ and return;
$bad_nodes{$node} .= $s;
$s =~ /Installation failed/ and $bad_nodes{$node} = '';
$s =~ /Installation is possible/ and delete $bad_nodes{$node};
+ undef;
});
foreach (keys %{$parallel->{nodes}}) {