From effcb6adaab11ac8b7ae13f40a1c1b6c8e6de0f2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 9 Jul 2008 21:50:05 +0000
Subject: factorize

---
 urpm/parallel.pm        | 2 ++
 urpm/parallel_ka_run.pm | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'urpm')

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);
 	}
-- 
cgit v1.2.1