bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib/dload: refactor deletion on failure

Browse source 
This moves all the delete-on-fail logic to under cleanup label. This
also implies should_unlink when a payload is received that doesn't allow
resuming.

Fixes .db.sig.part files leftover in the sync dir.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-08-17 19:45:57 -04:00 • committed by Dan McGee
parent 2dbdfe0788
commit 9f139550f8
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/dload.c
View file

@ -180,7 +180,7 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
static int curl_download_internal(struct dload_payload *payload, static int curl_download_internal(struct dload_payload *payload,
const char *localpath, char **final_file) const char *localpath, char **final_file)
{ {
int ret = -1, should_unlink = 0; int ret = -1, should_unlink = !payload->allow_resume;
FILE *localf = NULL; FILE *localf = NULL;
const char *useragent; const char *useragent;
const char *open_mode = "wb"; const char *open_mode = "wb";
@ -313,16 +313,12 @@ static int curl_download_internal(struct dload_payload *payload,
case CURLE_ABORTED_BY_CALLBACK: case CURLE_ABORTED_BY_CALLBACK:
goto cleanup; goto cleanup;
case CURLE_OPERATION_TIMEDOUT: case CURLE_OPERATION_TIMEDOUT:
dload_interrupted = 1;
/* fallthrough */ /* fallthrough */
default: default:
if(!payload->errors_ok) { if(!payload->errors_ok) {
handle->pm_errno = ALPM_ERR_LIBCURL; handle->pm_errno = ALPM_ERR_LIBCURL;
_alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
payload->filename, hostname, error_buffer); payload->filename, hostname, error_buffer);
if(!dload_interrupted) {
unlink(tempfile);
}
} else { } else {
_alpm_log(handle, ALPM_LOG_DEBUG, "failed retrieving file '%s' from %s : %s\n", _alpm_log(handle, ALPM_LOG_DEBUG, "failed retrieving file '%s' from %s : %s\n",
payload->filename, hostname, error_buffer); payload->filename, hostname, error_buffer);
@ -398,7 +394,7 @@ cleanup:
} }
} }
if(dload_interrupted && should_unlink) { if((ret == -1 || dload_interrupted) && should_unlink) {
unlink(tempfile); unlink(tempfile);
} }