diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-25 17:40:26 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-25 17:40:26 +0200 |
| commit | a708e7d28e890c3e230a215629b7f5c58c57f58d (patch) | |
| tree | b5efd2a09bdca63a8581d52df55bf93332db47b9 /lib/libalpm/dload.c | |
| parent | 90ddcbe71d483884b7627237121b1dee05b07dd0 (diff) | |
| parent | 2da59e1aa91fa4160ec1c8ec84d94d8141b2a832 (diff) | |
| download | pacman-a708e7d28e890c3e230a215629b7f5c58c57f58d.tar.gz pacman-a708e7d28e890c3e230a215629b7f5c58c57f58d.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/dload.c')
| -rw-r--r-- | lib/libalpm/dload.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index cd2857c3..9d919b0a 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -392,8 +392,15 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_OK: /* get http/ftp response code */ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode); + _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", respcode); if(respcode >= 400) { payload->unlink_on_fail = 1; + /* non-translated message is same as libcurl */ + snprintf(error_buffer, sizeof(error_buffer), + "The requested URL returned error: %ld", respcode); + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed retrieving file '%s' from %s : %s\n"), + payload->remote_name, hostname, error_buffer); goto cleanup; } break; @@ -402,15 +409,16 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* the hardcoded 'size exceeded' message is same as libcurl's normal */ + /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), - payload->remote_name, hostname, "Maximum file size exceeded"); + payload->remote_name, hostname, + curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); } goto cleanup; default: /* delete zero length downloads */ - if(stat(payload->tempfile_name, &st) == 0 && st.st_size == 0) { + if(fstat(fileno(localf), &st) == 0 && st.st_size == 0) { payload->unlink_on_fail = 1; } if(!payload->errors_ok) { |