moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Fix some fallout from the delta/download changes

Browse Source 
We removed one too many FREELIST() calls when trying to fix some memleaks,
and add a safety/sanity check to ensure filename is set, as packages in old
DBs are likely to not have this field.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-04-26 13:03:53 -05:00
parent 481c3edc89
commit 6d79ba2db0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/error.c
View File

@ -120,7 +120,7 @@ const char SYMEXPORT *alpm_strerror(int err)
case PM_ERR_PKG_CANT_REMOVE: case PM_ERR_PKG_CANT_REMOVE:
return _("cannot remove all files for package"); return _("cannot remove all files for package");
case PM_ERR_PKG_INVALID_NAME: case PM_ERR_PKG_INVALID_NAME:
return _("package name is not valid"); return _("package filename is not valid");
case PM_ERR_PKG_REPO_NOT_FOUND: case PM_ERR_PKG_REPO_NOT_FOUND:
return _("no such repository"); return _("no such repository");
/* Deltas */ /* Deltas */

18
lib/libalpm/sync.c
View File

@ -384,11 +384,16 @@ static int syncpkg_cmp(const void *s1, const void *s2)
* package. * package.
* @param newpkg the new package to upgrade to * @param newpkg the new package to upgrade to
*/ */
static void compute_download_size(pmpkg_t *newpkg) static int compute_download_size(pmpkg_t *newpkg)
{ {
char *fpath = _alpm_filecache_find(alpm_pkg_get_filename(newpkg)); const char *fname;
char *fpath;
unsigned long size = 0; unsigned long size = 0;
fname = alpm_pkg_get_filename(newpkg);
ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
fpath = _alpm_filecache_find(fname);
if(fpath) { if(fpath) {
FREE(fpath); FREE(fpath);
size = 0; size = 0;
@ -415,10 +420,11 @@ static void compute_download_size(pmpkg_t *newpkg)
size = alpm_pkg_get_size(newpkg); size = alpm_pkg_get_size(newpkg);
} }
_alpm_log(PM_LOG_DEBUG, "returning size %ld for pkg %s\n", size, _alpm_log(PM_LOG_DEBUG, "setting download size %ld for pkg %s\n", size,
alpm_pkg_get_name(newpkg)); alpm_pkg_get_name(newpkg));
newpkg->download_size = size; newpkg->download_size = size;
return(0);
} }
int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data) int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data)
@ -645,7 +651,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
for(i = list; i; i = i->next) { for(i = list; i; i = i->next) {
/* update download size field */ /* update download size field */
pmpkg_t *spkg = i->data; pmpkg_t *spkg = i->data;
compute_download_size(spkg); if(compute_download_size(spkg) != 0) {
ret = -1;
goto cleanup;
}
} }
cleanup: cleanup:
@ -859,6 +868,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
pm_errno = PM_ERR_RETRIEVE; pm_errno = PM_ERR_RETRIEVE;
goto error; goto error;
} }
FREELIST(files);
} }
} }
if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {