mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
cleanup: add_pkg() and remove_pkg()
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
53c749ce0a
commit
e39c104d13
@ -63,11 +63,10 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg)
|
|||||||
trans = handle->trans;
|
trans = handle->trans;
|
||||||
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
|
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
|
||||||
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
|
ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
|
||||||
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
|
|
||||||
db_local = handle->db_local;
|
db_local = handle->db_local;
|
||||||
|
|
||||||
pkgname = alpm_pkg_get_name(pkg);
|
pkgname = pkg->name;
|
||||||
pkgver = alpm_pkg_get_version(pkg);
|
pkgver = pkg->version;
|
||||||
|
|
||||||
_alpm_log(PM_LOG_DEBUG, "adding package '%s'\n", pkgname);
|
_alpm_log(PM_LOG_DEBUG, "adding package '%s'\n", pkgname);
|
||||||
|
|
||||||
@ -100,7 +99,7 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg)
|
|||||||
|
|
||||||
/* add the package to the transaction */
|
/* add the package to the transaction */
|
||||||
pkg->reason = PM_PKG_REASON_EXPLICIT;
|
pkg->reason = PM_PKG_REASON_EXPLICIT;
|
||||||
_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
|
_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction add list\n",
|
||||||
pkgname, pkgver);
|
pkgname, pkgver);
|
||||||
trans->add = alpm_list_add(trans->add, pkg);
|
trans->add = alpm_list_add(trans->add, pkg);
|
||||||
|
|
||||||
|
@ -59,13 +59,14 @@ int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg)
|
|||||||
ASSERT(trans->state == STATE_INITIALIZED,
|
ASSERT(trans->state == STATE_INITIALIZED,
|
||||||
RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
|
RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
|
||||||
|
|
||||||
pkgname = alpm_pkg_get_name(pkg);
|
pkgname = pkg->name;
|
||||||
|
|
||||||
if(_alpm_pkg_find(trans->remove, pkgname)) {
|
if(_alpm_pkg_find(trans->remove, pkgname)) {
|
||||||
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
|
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
_alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", pkgname);
|
_alpm_log(PM_LOG_DEBUG, "adding package %s to the transaction remove list\n",
|
||||||
|
pkgname);
|
||||||
trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg));
|
trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user