diff options
| author | Dan McGee <dan@archlinux.org> | 2009-08-18 20:49:25 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-08-18 20:49:25 -0500 |
| commit | 92f0775e76c75ebe9e30355cc99bb40cf365abcb (patch) | |
| tree | 6268a6ce1457109bf5878d3aa66bfbf3a5c5afe2 /lib | |
| parent | 7dae79e7b95c517df136003728363dc9ad346a7e (diff) | |
| parent | bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (diff) | |
| download | pacman-92f0775e76c75ebe9e30355cc99bb40cf365abcb.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/dload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 79ecf85c..f8fb09fe 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -130,8 +130,8 @@ static int download_internal(const char *url, const char *localpath, /* libfetch does not reset the error code */ fetchLastErrCode = 0; - /* 10s timeout - TODO make a config option */ - fetchTimeout = 10000; + /* 10s timeout */ + fetchTimeout = 10; /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ |