summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--urpm/download.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 495fc0ba..6f36fd67 100644
--- a/NEWS
+++ b/NEWS
@@ -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");