diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:50:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:50:05 +0000 |
| commit | effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2 (patch) | |
| tree | 4f6f146ba30fcff3b2af0fc6921d4c4464387f81 | |
| parent | 5e5580094b37b43afbdb1816ae772237d33fa245 (diff) | |
| download | urpmi-effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2.tar urpmi-effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2.tar.gz urpmi-effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2.tar.bz2 urpmi-effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2.tar.xz urpmi-effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2.zip | |
factorize
| -rw-r--r-- | urpm/parallel.pm | 2 | ||||
| -rw-r--r-- | urpm/parallel_ka_run.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 809a9391..f9030698 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -132,6 +132,8 @@ sub parse_urpme_output { sub parse_urpmq_output { my ($urpm, $state, $node, $s, $cont, $chosen, %options) = @_; + chomp $s; + if (my ($action, $what) = $s =~ /^\@([^\@]*)\@(.*)/) { if ($action eq 'removing') { $state->{rejected}{$what}{removed} = 1; diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 214974d7..793f3d7c 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -114,7 +114,6 @@ sub parallel_resolve_dependencies { #- now try an iteration of urpmq. open my $fh, rshp_command($urpm, $parallel, "-v", "urpmq --synthesis $synthesis -fduc $line " . join(' ', keys %chosen)) . " |"; while (my $s = <$fh>) { - chomp $s; my ($node, $s_) = _parse_rshp_output($s) or next; urpm::parallel::parse_urpmq_output($urpm, $state, $node, $s_, \$cont, \%chosen, %options); } |