From 8e86785b214b40f1fb5bb36b11da7c9e26be0c57 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 9 Jul 2008 15:12:26 +0000
Subject: - all tools   o fix broken ssh:// (regression introduced in 6.0)

---
 urpm/download.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'urpm/download.pm')

diff --git a/urpm/download.pm b/urpm/download.pm
index bf70fac6..cee61fa3 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -502,9 +502,9 @@ sub sync_rsync {
 		($limit_rate ? "--bwlimit=$limit_rate" : @{[]}),
 		($options->{quiet} ? qw(-q) : qw(--progress -v)),
 		($options->{compress} ? qw(-z) : @{[]}),
-		($options->{ssh} ? qq(-e $options->{ssh}) : @{[]}),
-		"--timeout=$CONNECT_TIMEOUT",
-		"--contimeout=$CONNECT_TIMEOUT",
+		($options->{ssh} ? qq(-e $options->{ssh}) : 
+		   ("--timeout=$CONNECT_TIMEOUT",
+		    "--contimeout=$CONNECT_TIMEOUT")),
 		qw(--partial --no-whole-file --no-motd --copy-links),
 		(defined $options->{'rsync-options'} ? split /\s+/, $options->{'rsync-options'} : ()),
 		"'$file' '$options->{dir}' 2>&1");
-- 
cgit v1.2.1