index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Aurelien Foret <aurelien@archlinux.org> | 2005-04-24 11:14:15 +0000 |
---|---|---|
committer | Aurelien Foret <aurelien@archlinux.org> | 2005-04-24 11:14:15 +0000 |
commit | e1c7d79ecb84f500c5dfbb4d4bd4f9885e9bb783 (patch) | |
tree | 7cb6772af4202d2bcf9609afe0e48e788179d9e4 /lib/libalpm/sync.c | |
parent | e8382cca7c5a03f4f88f78e919430268cd3d7282 (diff) |
-rw-r--r-- | lib/libalpm/sync.c | 8 |
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f6de47d3..0d537274 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -478,8 +478,8 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local) ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); - /* remove any conflicting packages (WITHOUT dep checks) */ - /* ORE - alpm does not handle removal of conflicting pkgs for now */ + /* ORE + remove any conflicting packages (WITHOUT dep checks) */ /* remove to-be-replaced packages */ tr = trans_new(PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS); @@ -506,6 +506,8 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local) pm_errno = PM_ERR_XXX; goto error; } + /* we want the frontend to be aware of commit details */ + tr->cb = trans->cb; if(trans_commit(tr) == -1) { _alpm_log(PM_LOG_ERROR, "could not commit transaction"); pm_errno = PM_ERR_XXX; @@ -543,6 +545,8 @@ int sync_commit(pmtrans_t *trans, pmdb_t *db_local) pm_errno = PM_ERR_XXX; goto error; } + /* we want the frontend to be aware of commit details */ + tr->cb = trans->cb; if(trans_commit(tr) == -1) { _alpm_log(PM_LOG_ERROR, "could not commit transaction"); pm_errno = PM_ERR_XXX; |