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

lib/sync: inform callers of compute_download_size of a partial

Browse source 
Extend the return values of compute_download_size to allow callers to
know that a .part file exists for the package.

This extra value isn't currently used, but it'll be needed later on.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-10-18 10:46:47 -04:00 • committed by Dan McGee
parent 571f2f7814
commit 2da59e1aa9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/sync.c
View file

@ -288,6 +288,7 @@ static int compute_download_size(alpm_pkg_t *newpkg)
char *fpath, *fnamepart = NULL; char *fpath, *fnamepart = NULL;
off_t size = 0; off_t size = 0;
alpm_handle_t *handle = newpkg->handle; alpm_handle_t *handle = newpkg->handle;
int ret = 0;
if(newpkg->origin != PKG_FROM_SYNCDB) { if(newpkg->origin != PKG_FROM_SYNCDB) {
newpkg->infolevel |= INFRQ_DSIZE; newpkg->infolevel |= INFRQ_DSIZE;
@ -316,6 +317,9 @@ static int compute_download_size(alpm_pkg_t *newpkg)
size = newpkg->size - st.st_size; size = newpkg->size - st.st_size;
size = size < 0 ? 0 : size; size = size < 0 ? 0 : size;
} }
/* tell the caller that we have a partial */
ret = 1;
} else if(handle->usedelta) { } else if(handle->usedelta) {
off_t dltsize; off_t dltsize;
@ -345,7 +349,7 @@ finish:
FREE(fpath); FREE(fpath);
FREE(fnamepart); FREE(fnamepart);
return 0; return ret;
} }
int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
@ -606,7 +610,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
for(i = trans->add; i; i = i->next) { for(i = trans->add; i; i = i->next) {
/* update download size field */ /* update download size field */
alpm_pkg_t *spkg = i->data; alpm_pkg_t *spkg = i->data;
if(compute_download_size(spkg) != 0) { if(compute_download_size(spkg) < 0) {
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }