diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 15:12:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 15:12:26 +0000 |
| commit | 8e86785b214b40f1fb5bb36b11da7c9e26be0c57 (patch) | |
| tree | dcb721f38b4a23e23961268579528304a3d31de7 | |
| parent | 4299adf857688fc24bf04fe152575a42679a9aa2 (diff) | |
| download | urpmi-8e86785b214b40f1fb5bb36b11da7c9e26be0c57.tar urpmi-8e86785b214b40f1fb5bb36b11da7c9e26be0c57.tar.gz urpmi-8e86785b214b40f1fb5bb36b11da7c9e26be0c57.tar.bz2 urpmi-8e86785b214b40f1fb5bb36b11da7c9e26be0c57.tar.xz urpmi-8e86785b214b40f1fb5bb36b11da7c9e26be0c57.zip | |
- all tools
o fix broken ssh:// (regression introduced in 6.0)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/download.pm | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- all tools + o fix broken ssh:// (regression introduced in 6.0) - urpmi, urpme, urpmq: o fix orphans handling: suggested packages must not be detected as orphans - urpmi: 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"); |