diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
| commit | 3849c3aec130601572b9e06b42bb6af5938936de (patch) | |
| tree | f298f227f4ff591390e55b4f02812f12312dd5c7 /lib/libalpm/dload.c | |
| parent | 326c6a8eed60bfd6aa0d653dad722d8637022d68 (diff) | |
| parent | 78adb71f20ee335dff49e34d33f04817a40002b6 (diff) | |
| download | pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.gz pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.xz | |
Merge branch 'maint'
Conflicts:
contrib/pacsysclean.in
src/pacman/conf.h
Diffstat (limited to 'lib/libalpm/dload.c')
| -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 7f898954..05988065 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -436,8 +436,8 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_WRITEDATA, localf); - /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or - * something along those lines. Store the old signal handler first. */ + /* Ignore any SIGPIPE signals. With libcurl, these shouldn't be happening, + * but better safe than sorry. Store the old signal handler first. */ mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe); mask_signal(SIGINT, &inthandler, &orig_sig_int); |