summaryrefslogtreecommitdiffstats
path: root/urpm/parallel.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 16:21:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 16:21:00 +0000
commit9c7623083e6b9dc7336cc1e9de1ea7cb90b08939 (patch)
tree1aa8b04c03af70d64e865110404c5299fa2b4ba2 /urpm/parallel.pm
parent53046fcdc6f505401adb0b7f42a2448f0141247a (diff)
downloadurpmi-9c7623083e6b9dc7336cc1e9de1ea7cb90b08939.tar
urpmi-9c7623083e6b9dc7336cc1e9de1ea7cb90b08939.tar.gz
urpmi-9c7623083e6b9dc7336cc1e9de1ea7cb90b08939.tar.bz2
urpmi-9c7623083e6b9dc7336cc1e9de1ea7cb90b08939.tar.xz
urpmi-9c7623083e6b9dc7336cc1e9de1ea7cb90b08939.zip
urpm_popen errors are not fatal by default on ssh, only for urpmq
Diffstat (limited to 'urpm/parallel.pm')
-rw-r--r--urpm/parallel.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index 32ff587a..4c44c55d 100644
--- a/urpm/parallel.pm
+++ b/urpm/parallel.pm
@@ -212,11 +212,12 @@ sub parallel_resolve_dependencies {
#- the following state should be cleaned for each iteration.
delete $state->{selected};
#- now try an iteration of urpmq.
- $parallel->urpm_popen($urpm, 'urpmq', "--synthesis $synthesis -fmc $line " . join(' ', keys %chosen), sub {
+ my @errors = $parallel->urpm_popen($urpm, 'urpmq', "--synthesis $synthesis -fmc $line " . join(' ', keys %chosen), sub {
my ($node, $s) = @_;
_parse_urpmq_output($urpm, $state, $node, $s, \$cont, \%chosen, %options);
undef;
});
+ @errors and $urpm->{fatal}(1, join("\n", @errors));
#- check for internal error of resolution.
$cont == 1 and die "internal distant urpmq error on choice not taken";
} while $cont;