summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/sync.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-19 20:18:42 +0200
committerDan McGee <dan@archlinux.org>2011-09-19 20:18:42 +0200
commite1899cbc64c6b634107f09c3a3e8152c63078636 (patch)
treede6bd009664fc863f3f997cf4a78f2d75a9c2e5b /lib/libalpm/sync.c
parenta94ad2974031138dbb4d42a939dfc0cd15a75ce7 (diff)
downloadpacman-e1899cbc64c6b634107f09c3a3e8152c63078636.tar.gz
pacman-e1899cbc64c6b634107f09c3a3e8152c63078636.tar.xz
Be smarter about running ldconfig during removal transactions
1. Don't run it if something failed in package removal- this mirrors what we already do in sync transactions. 2. Don't run it if we are invoking it for the replaces removal bit of a sync transaction- it doesn't make sense to run ldconfig halfway through a sync install; we should only run it once at the end. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
-rw-r--r--lib/libalpm/sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 717ba7ce..c6a79fa0 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1042,7 +1042,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
if(replaces) {
_alpm_log(handle, ALPM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n");
/* we want the frontend to be aware of commit details */
- if(_alpm_remove_packages(handle) == -1) {
+ if(_alpm_remove_packages(handle, 0) == -1) {
_alpm_log(handle, ALPM_LOG_ERROR, _("could not commit removal transaction\n"));
return -1;
}