Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=74b15408a12e7e9c7d8fe2ad14cc45066db9d464
commit 74b15408a12e7e9c7d8fe2ad14cc45066db9d464 Author: Michel Hermier <[email protected]> Date: Sun Apr 21 12:27:40 2013 +0200 libpacman: s/PM_SYNC_TYPE_/PM_TRANS_TYPE_/g. diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 3e91a6c..8602cef 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -234,12 +234,6 @@ void *pacman_grp_getinfo(PM_GRP *grp, unsigned char parm); * Sync */ -/* Types */ -enum { - PM_SYNC_TYPE_REPLACE = 1, - PM_SYNC_TYPE_UPGRADE, - PM_SYNC_TYPE_DEPEND -}; /* Info parameters */ enum { PM_SYNC_TYPE = 1, diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index ccbb1f2..275ac31 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -157,10 +157,11 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) /* add the package to the transaction */ if(!__pacman_trans_get_trans_pkg(trans, spkg->name)) { - ps = __pacman_trans_pkg_new(PM_SYNC_TYPE_UPGRADE, spkg); + ps = __pacman_trans_pkg_new(PM_TRANS_TYPE_UPGRADE, spkg); if(ps == NULL) { goto error; } + ps->flags = PM_TRANS_FLAG_EXPLICIT; ps->pkg_local = local; _pacman_log(PM_LOG_FLOW2, _("adding target '%s' to the transaction set"), spkg->name); trans->packages = _pacman_list_add(trans->packages, ps); @@ -246,7 +247,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) /* add the dependencies found by resolvedeps to the transaction set */ pmpkg_t *spkg = i->data; if(!__pacman_trans_get_trans_pkg(trans, spkg->name)) { - pmsyncpkg_t *ps = __pacman_trans_pkg_new(PM_SYNC_TYPE_DEPEND, spkg); + pmsyncpkg_t *ps = __pacman_trans_pkg_new(PM_TRANS_TYPE_ADD, spkg); if(ps == NULL) { ret = -1; goto cleanup; @@ -413,9 +414,9 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) goto cleanup; } q->requiredby = _pacman_strlist_dup(local->requiredby); - if(ps->type != PM_SYNC_TYPE_REPLACE) { + if(ps->type != PM_TRANS_TYPE_ADD) { /* switch this sync type to REPLACE */ - ps->type = PM_SYNC_TYPE_REPLACE; + ps->type = PM_TRANS_TYPE_ADD; //FREEPKG(ps->data); } /* append to the replaces list */ @@ -657,9 +658,9 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) /* using _pacman_list_last() is ok because addtarget() adds the new target at the * end of the tr->packages list */ spkg = _pacman_list_last(tr->_packages)->data; - if(ps->type == PM_SYNC_TYPE_DEPEND || trans->flags & PM_TRANS_FLAG_ALLDEPS) { + if(ps->type == PM_TRANS_TYPE_ADD || trans->flags & PM_TRANS_FLAG_ALLDEPS) { spkg->reason = PM_PKG_REASON_DEPEND; - } else if(ps->type == PM_SYNC_TYPE_UPGRADE && !handle->sysupgrade) { + } else if(ps->type == PM_TRANS_TYPE_UPGRADE && !handle->sysupgrade) { spkg->reason = PM_PKG_REASON_EXPLICIT; } } diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index d429809..2b3d7c0 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -61,7 +61,7 @@ pmsyncpkg_t *__pacman_trans_pkg_new(int type, pmpkg_t *spkg) void __pacman_trans_pkg_delete(pmsyncpkg_t *trans_pkg) { - if(trans_pkg == NULL) { + if (trans_pkg == NULL) { return; } @@ -151,7 +151,7 @@ pmtrans_t *_pacman_trans_new() { pmtrans_t *trans = _pacman_zalloc(sizeof(pmtrans_t)); - if(trans) { + if (trans != NULL) { __pacman_object_init (&trans->base, &_pacman_trans_ops); trans->state = STATE_IDLE; } @@ -214,7 +214,7 @@ pmpkg_t *fakepkg_create(const char *name) pmpkg_t *dummy = NULL; dummy = _pacman_pkg_new(NULL, NULL); - if(dummy == NULL) { + if (dummy == NULL) { goto error; } @@ -452,7 +452,7 @@ int _pacman_trans_prepare(pmtrans_t *trans, pmlist_t **data) ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); /* If there's nothing to do, return without complaining */ - if(trans->_packages == NULL && trans->packages == NULL) { + if (trans->packages == NULL) { return(0); } @@ -644,7 +644,7 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t **data) ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); /* If there's nothing to do, return without complaining */ - if(trans->_packages == NULL && trans->packages == NULL) { + if (trans->packages == NULL) { return(0); } diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c index f50002f..71269b8 100644 --- a/lib/libpacman/trans_sysupgrade.c +++ b/lib/libpacman/trans_sysupgrade.c @@ -113,7 +113,7 @@ int _pacman_sync_sysupgrade(pmtrans_t *trans) ps->replaces = _pacman_list_add(ps->replaces, dummy); } else { /* none found -- enter pkg into the final sync list */ - ps = __pacman_trans_pkg_new (PM_SYNC_TYPE_REPLACE, spkg); + ps = __pacman_trans_pkg_new (PM_TRANS_TYPE_ADD, spkg); if(ps == NULL) { FREEPKG(dummy); goto error; @@ -186,7 +186,7 @@ int _pacman_sync_sysupgrade(pmtrans_t *trans) local->name, local->version, local->version, spkg->version); /* check if spkg->name is already in the packages list. */ if(!__pacman_trans_get_trans_pkg(trans, spkg->name)) { - ps = __pacman_trans_pkg_new (PM_SYNC_TYPE_UPGRADE, spkg); + ps = __pacman_trans_pkg_new (PM_TRANS_TYPE_UPGRADE, spkg); if(ps == NULL) { goto error; } diff --git a/src/pacman-g2/sync.c b/src/pacman-g2/sync.c index 0d27b57..910a820 100644 --- a/src/pacman-g2/sync.c +++ b/src/pacman-g2/sync.c @@ -517,6 +517,7 @@ int syncpkg(list_t *targets) if(!((unsigned long)pacman_trans_getinfo(PM_TRANS_FLAGS) & PM_TRANS_FLAG_PRINTURIS)) { list_t *list_install = NULL; list_t *list_remove = NULL; + list_t *list_upgrade = NULL; char *str; unsigned long totalsize = 0; unsigned long totalusize = 0; @@ -527,25 +528,24 @@ int syncpkg(list_t *targets) PM_PKG *pkg = pacman_sync_getinfo(ps, PM_SYNC_PKG); char *pkgname, *pkgver; - if((long)pacman_sync_getinfo(ps, PM_SYNC_TYPE) == PM_SYNC_TYPE_REPLACE) { - PM_LIST *j; - data = pacman_sync_getinfo(ps, PM_SYNC_DATA); - for(j = pacman_list_first(data); j; j = pacman_list_next(j)) { - PM_PKG *p = pacman_list_getdata(j); - pkgname = pacman_pkg_getinfo(p, PM_PKG_NAME); - if(!list_is_strin(pkgname, list_remove)) { - list_remove = list_add(list_remove, strdup(pkgname)); - } - } - } - pkgname = pacman_pkg_getinfo(pkg, PM_PKG_NAME); pkgver = pacman_pkg_getinfo(pkg, PM_PKG_VERSION); totalsize += (long)pacman_pkg_getinfo(pkg, PM_PKG_SIZE); totalusize += (long)pacman_pkg_getinfo(pkg, PM_PKG_USIZE); asprintf(&str, "%s-%s", pkgname, pkgver); - list_install = list_add(list_install, str); + + switch ((long)pacman_sync_getinfo(ps, PM_SYNC_TYPE)) { + case PM_TRANS_TYPE_ADD: + list_install = list_add (list_install, str); + break; + case PM_TRANS_TYPE_REMOVE: + list_remove = list_add (list_remove, str); + break; + case PM_TRANS_TYPE_UPGRADE: + list_upgrade = list_add (list_upgrade, str); + break; + } } if(list_remove) { MSG(NL, _("\nRemove: ")); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
