summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-18 23:52:57 +0200
committerDan McGee <dan@archlinux.org>2010-10-18 23:52:57 +0200
commit0f3957ab48f34df8e151ec026dfac0d9d2df5aec (patch)
tree8d10bbaa8eaa12b8c7cd578067d24ba214ee454f
parentce96f39ac9313a3583f346adfd2c709a658fae58 (diff)
parent30734c9a4a63a1bfac0921b944e84f24dc87d76f (diff)
downloadpacman-0f3957ab48f34df8e151ec026dfac0d9d2df5aec.tar.gz
pacman-0f3957ab48f34df8e151ec026dfac0d9d2df5aec.tar.xz
Merge branch 'maint'
-rw-r--r--lib/libalpm/remove.c4
-rw-r--r--lib/libalpm/sync.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index b53d85a6..b2137b19 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -413,6 +413,10 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
alpm_list_t *newfiles;
_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 */
newfiles = alpm_list_reverse(files);
for(lp = newfiles; lp; lp = alpm_list_next(lp)) {
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ab3d7871..1e73b8b0 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -332,7 +332,9 @@ int SYMEXPORT alpm_sync_dbtarget(char *dbname, char *target)
if(dbs == NULL) {
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.