diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2008-06-15 17:44:22 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2008-06-15 17:44:22 +0000 |
| commit | 812bea8f9d33daedaea3eca51a5f4f57ec8f42fa (patch) | |
| tree | 69488d4f4476c66cbaefff093df18c0d98f78a7c | |
| parent | 3c93c97ba1fe73867f75f9c6e79d434eb6ebaaf9 (diff) | |
| download | urpmi-812bea8f9d33daedaea3eca51a5f4f57ec8f42fa.tar urpmi-812bea8f9d33daedaea3eca51a5f4f57ec8f42fa.tar.gz urpmi-812bea8f9d33daedaea3eca51a5f4f57ec8f42fa.tar.bz2 urpmi-812bea8f9d33daedaea3eca51a5f4f57ec8f42fa.tar.xz urpmi-812bea8f9d33daedaea3eca51a5f4f57ec8f42fa.zip | |
urpmi: set connection timeout for rsync as well
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/download.pm | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,5 @@ +- urpmi: + o set connection timeout for rsync as well (Anssi) - urpmi.addmedia, urpmi.update: o fix --no-md5sum (regression introduced in 5.20) (#41237) diff --git a/urpm/download.pm b/urpm/download.pm index 27f03f98..bf70fac6 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -503,6 +503,8 @@ sub sync_rsync { ($options->{quiet} ? qw(-q) : qw(--progress -v)), ($options->{compress} ? qw(-z) : @{[]}), ($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"); |