moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2010-10-18 16:52:57 -05:00
commit 0f3957ab48
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/remove.c
View File

@ -413,6 +413,10 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
alpm_list_t *newfiles; alpm_list_t *newfiles;
_alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum); _alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum);
/* init progress bar */
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
pkg_count, (pkg_count - targcount + 1));
/* iterate through the list backwards, unlinking files */ /* iterate through the list backwards, unlinking files */
newfiles = alpm_list_reverse(files); newfiles = alpm_list_reverse(files);
for(lp = newfiles; lp; lp = alpm_list_next(lp)) { for(lp = newfiles; lp; lp = alpm_list_next(lp)) {

4
lib/libalpm/sync.c
View File

@ -332,7 +332,9 @@ int SYMEXPORT alpm_sync_dbtarget(char *dbname, char *target)
if(dbs == NULL) { if(dbs == NULL) {
RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1); RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1);
} }
return(sync_target(dbs, target)); int ret = sync_target(dbs, target);
alpm_list_free(dbs);
return(ret);
} }
/** Add a sync target to the transaction. /** Add a sync target to the transaction.