Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=cdca29bd2ae5c2d7c1565146719e5030ce69b0f0
commit cdca29bd2ae5c2d7c1565146719e5030ce69b0f0 Author: Michel Hermier <[email protected]> Date: Wed May 14 22:10:15 2014 +0200 libpacman: Rework Package::add method arguments. diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 0c66d00..555c30b 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1108,7 +1108,7 @@ int pacman_trans_addtarget(const char *target) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); - return trans->add(target); + return trans->add(target, trans->type, trans->flags); } /** Prepare a transaction. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 2e88f24..dc1f1ef 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -294,7 +294,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) for(j = ps->data; j; j = j->next) { Package *pkg = j->data; if(!_pacman_pkg_isin(pkg->name(), tr->packages)) { - if(tr->add(pkg->name()) == -1) { + if(tr->add(pkg->name(), tr->type, tr->flags) == -1) { goto error; } replaces++; @@ -331,7 +331,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) Package *spkg = ps->pkg_new; char str[PATH_MAX]; snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, handle->root, handle->cachedir, spkg->name(), spkg->version(), spkg->arch); - if(tr->add(str) == -1) { + if(tr->add(str, tr->type, tr->flags) == -1) { goto error; } /* using _pacman_list_last() is ok because addtarget() adds the new target at the @@ -619,13 +619,6 @@ int __pmtrans_t::add(Package *pkg, pmtranstype_t type, int flags) return 0; } -pmsyncpkg_t *__pmtrans_t::add(const char *target, pmtranstype_t type, int flags) -{ - ASSERT(!f_strempty(target), RET_ERR(PM_ERR_TRANS_NULL, NULL)); - - return NULL; -} - static Package *_pacman_filedb_load(Database *db, const char *name) { @@ -669,7 +662,8 @@ int _pacman_remove_addtarget(pmtrans_t *trans, const char *name) return trans->add(pkg_local, trans->type, 0); } -int __pmtrans_t::add(const char *target) +// FIXME: Make returning a pmsyncpkg_t in the future +int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags) { pmlist_t *i; Package *pkg_new, *pkg_local, *pkg_queued = NULL; diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 505e60a..8f592eb 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -67,8 +67,7 @@ struct __pmtrans_t pmsyncpkg_t *add(pmsyncpkg_t *syncpkg, int flags); int add(libpacman::Package *pkg, pmtranstype_t type, int flags); - pmsyncpkg_t *add(const char *target, pmtranstype_t type, int flags); - int add(const char *target); + int add(const char *target, pmtranstype_t type, int flags); int (*set_state)(pmtrans_t *trans, int new_state); libpacman::Handle *handle; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
