Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6222cf95e8362448d1ff3d99b2726bd0a694bb8d
commit 6222cf95e8362448d1ff3d99b2726bd0a694bb8d Author: Michel Hermier <[email protected]> Date: Sun Jun 8 11:16:51 2014 +0200 libpacman: Rename Transaction::handle to m_handle. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 3583132..9b1bbf8 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -58,7 +58,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) pmdepmissing_t *miss = NULL; int howmany, remain; double percent; - Database *db_local = trans->handle->db_local; + Database *db_local = trans->m_handle->db_local; if(db_local == NULL) { return(NULL); @@ -243,8 +243,8 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans) Package *p, *dbpkg; double percent; int howmany, remain; - Database *db_local = trans->handle->db_local; - const char *root = trans->handle->root; + Database *db_local = trans->m_handle->db_local; + const char *root = trans->m_handle->root; if(db_local == NULL || targets == NULL || root == NULL) { return(NULL); diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index 53ff75f..3a4401e 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -156,6 +156,7 @@ int _pacman_syncdb_update(Database *db, int force) time_t newmtime = PM_TIME_INVALID; time_t timestamp = PM_TIME_INVALID; int ret, updated=0; + Handle *handle = db->m_handle; if(!force) { db->gettimestamp(×tamp); @@ -168,7 +169,7 @@ int _pacman_syncdb_update(Database *db, int force) snprintf(path, PATH_MAX, "%s" PM_EXT_DB, db->treename); files = _pacman_stringlist_append(files, path); - snprintf(path, PATH_MAX, "%s%s", m_handle->root, m_handle->dbpath); + snprintf(path, PATH_MAX, "%s%s", handle->root, handle->dbpath); ret = _pacman_downloadfiles_forreal(db->servers, path, files, ×tamp, &newmtime, 0); FREELIST(files); @@ -183,8 +184,8 @@ int _pacman_syncdb_update(Database *db, int force) _pacman_log(PM_LOG_DEBUG, _("sync: new mtime for %s: %s\n"), db->treename, newmtime); updated = 1; } - snprintf(dirpath, PATH_MAX, "%s%s/%s", m_handle->root, m_handle->dbpath, db->treename); - snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, m_handle->root, m_handle->dbpath, db->treename); + snprintf(dirpath, PATH_MAX, "%s%s/%s", handle->root, handle->dbpath, db->treename); + snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); /* remove the old dir */ _pacman_rmrf(dirpath); diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 5cb4adc..53fdedb 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -218,7 +218,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag int found = 0; pmlist_t *baddeps = NULL; pmdepmissing_t *miss = NULL; - Database *db_local = trans->handle->db_local; + Database *db_local = trans->m_handle->db_local; if(db_local == NULL) { return(NULL); @@ -566,7 +566,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, pmlist_t *i, *j; pmlist_t *targ; pmlist_t *deps = NULL; - pmlist_t *dbs_sync = trans->handle->dbs_sync; + pmlist_t *dbs_sync = trans->m_handle->dbs_sync; if(dbs_sync == NULL || syncpkg == NULL) { return(-1); diff --git a/lib/libpacman/packages_transaction.cpp b/lib/libpacman/packages_transaction.cpp index 8edd104..97b0428 100644 --- a/lib/libpacman/packages_transaction.cpp +++ b/lib/libpacman/packages_transaction.cpp @@ -44,8 +44,8 @@ _pacman_packages_transaction_set_state(pmtrans_t *trans, int new_state) const char *root, *triggersdir, *trigger_function; const pmlist_t *lp; - triggersdir = trans->handle->triggersdir; - root = trans->handle->root; + triggersdir = trans->m_handle->triggersdir; + root = trans->m_handle->root; trigger_function = trigger_function_table[new_state]; if(_pacman_strempty(trigger_function)) { diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 7b4c51c..30ec51f 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -91,7 +91,7 @@ __pmtrans_t::__pmtrans_t(Handle *handle, pmtranstype_t type, unsigned int flags) _("could not initialize transaction: Unknown Transaction Type %d"), type); } - this->handle = handle; + m_handle = handle; m_type = type; this->flags = flags; // packages = f_ptrlist_new(); @@ -307,10 +307,10 @@ int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags) pmlist_t *i; Package *pkg_new, *pkg_local, *pkg_queued = NULL; Database *db_local; - pmlist_t *dbs_sync = handle->dbs_sync; + pmlist_t *dbs_sync = m_handle->dbs_sync; /* Sanity checks */ - ASSERT((db_local = handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + ASSERT((db_local = m_handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(!_pacman_strempty(target), RET_ERR(PM_ERR_WRONG_ARGS, -1)); if(_pacman_list_is_strin(target, targets)) { @@ -474,7 +474,7 @@ int __pmtrans_t::add(const char *target, pmtranstype_t type, int flags) } /* ignore holdpkgs on upgrade */ - if((this == handle->trans) && _pacman_list_is_strin(pkg_local->name(), handle->holdpkg)) { + if((this == m_handle->trans) && _pacman_list_is_strin(pkg_local->name(), m_handle->holdpkg)) { int resp = 0; QUESTION(this, PM_TRANS_CONV_REMOVE_HOLDPKG, pkg_local, NULL, NULL, &resp); if(!resp) { @@ -505,7 +505,7 @@ int __pmtrans_t::prepare(pmlist_t **data) int ret = 0; /* Sanity checks */ - ASSERT((db_local = handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + ASSERT((db_local = m_handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); if(data) { *data = NULL; @@ -972,7 +972,7 @@ cleanup: for (rmlist=pkg_new->removes(); rmlist!=NULL; rmlist=rmlist->next) { char rm_fname[PATH_MAX]; - snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data); + snprintf(rm_fname, PATH_MAX, "%s%s", m_handle->root, (char *)rmlist->data); remove(rm_fname); } } @@ -1017,7 +1017,8 @@ int _pacman_fpmpackage_install(Package *pkg, pmtranstype_t type, pmtrans_t *tran double percent = 0; struct archive *archive; struct archive_entry *entry; - Database *db_local = trans->handle->db_local; + Handle *handle = trans->m_handle; + Database *db_local = handle->db_local; pmlist_t *lp; char expath[PATH_MAX], cwd[PATH_MAX] = ""; @@ -1317,6 +1318,7 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int pmlist_t *lp; struct stat buf; int position = 0; + Handle *handle = trans->m_handle; char line[PATH_MAX+1]; int filenum = _pacman_list_count(pkg->files()); @@ -1408,6 +1410,7 @@ int _pacman_cachedpkg_check_integrity(Package *spkg, __pmtrans_t *trans, pmlist_ char *md5sum1, *md5sum2, *sha1sum1, *sha1sum2; char *ptr=NULL; int retval = 0; + Handle *handle = trans->m_handle; spkg->filename(pkgname, sizeof(pkgname)); md5sum1 = spkg->md5sum; @@ -1504,7 +1507,7 @@ int __pmtrans_t::commit(pmlist_t **data) pmtrans_t *tr = NULL; char pm_install[PATH_MAX]; - ASSERT((db_local = handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + ASSERT((db_local = m_handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); if(data!=NULL) *data = NULL; @@ -1525,13 +1528,13 @@ int __pmtrans_t::commit(pmlist_t **data) state = STATE_DOWNLOADING; /* group sync records by repository and download */ - snprintf(ldir, PATH_MAX, "%s%s", handle->root, handle->cachedir); + snprintf(ldir, PATH_MAX, "%s%s", m_handle->root, m_handle->cachedir); - for(tries = 0; tries < handle->maxtries; tries++) { + for(tries = 0; tries < m_handle->maxtries; tries++) { retval = 0; FREELIST(*data); int done = 1; - for(i = handle->dbs_sync; i; i = i->next) { + for(i = m_handle->dbs_sync; i; i = i->next) { struct stat buf; Database *current = i->data; @@ -1575,7 +1578,7 @@ int __pmtrans_t::commit(pmlist_t **data) * the package afterwards. */ _pacman_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead")); - snprintf(ldir, PATH_MAX, "%s/tmp", handle->root); + snprintf(ldir, PATH_MAX, "%s/tmp", m_handle->root); if(pacman_set_option(PM_OPT_CACHEDIR, (long)"/tmp") == -1) { _pacman_log(PM_LOG_WARNING, _("failed to set option CACHEDIR (%s)\n"), pacman_strerror(pm_errno)); RET_ERR(PM_ERR_RETRIEVE, -1); @@ -1627,11 +1630,11 @@ int __pmtrans_t::commit(pmlist_t **data) pmlist_t *i, *j; int replaces = 0; - if(handle->sysupgrade) { + if(m_handle->sysupgrade) { _pacman_runhook("pre_sysupgrade", this); } /* remove conflicting and to-be-replaced packages */ - tr = new __pmtrans_t(handle, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS); + tr = new __pmtrans_t(m_handle, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS); if(tr == NULL) { _pacman_log(PM_LOG_ERROR, _("could not create removal transaction")); pm_errno = PM_ERR_MEMORY; @@ -1670,7 +1673,7 @@ int __pmtrans_t::commit(pmlist_t **data) /* install targets */ _pacman_log(PM_LOG_FLOW1, _("installing packages")); - tr = new __pmtrans_t(handle, PM_TRANS_TYPE_UPGRADE, flags | PM_TRANS_FLAG_NODEPS); + tr = new __pmtrans_t(m_handle, PM_TRANS_TYPE_UPGRADE, flags | PM_TRANS_FLAG_NODEPS); if(tr == NULL) { _pacman_log(PM_LOG_ERROR, _("could not create transaction")); pm_errno = PM_ERR_MEMORY; @@ -1683,7 +1686,7 @@ int __pmtrans_t::commit(pmlist_t **data) pmsyncpkg_t *ps = i->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); + snprintf(str, PATH_MAX, "%s%s/%s-%s-%s" PM_EXT_PKG, m_handle->root, m_handle->cachedir, spkg->name(), spkg->version(), spkg->arch); if(tr->add(str, tr->m_type, tr->flags) == -1) { goto error; } @@ -1692,7 +1695,7 @@ int __pmtrans_t::commit(pmlist_t **data) spkg = _pacman_list_last(tr->packages)->data; if(ps->type == PM_SYNC_TYPE_DEPEND || flags & PM_TRANS_FLAG_ALLDEPS) { spkg->m_reason = PM_PKG_REASON_DEPEND; - } else if(ps->type == PM_SYNC_TYPE_UPGRADE && !handle->sysupgrade) { + } else if(ps->type == PM_SYNC_TYPE_UPGRADE && !m_handle->sysupgrade) { spkg->m_reason = PM_PKG_REASON_EXPLICIT; } } @@ -1754,7 +1757,7 @@ int __pmtrans_t::commit(pmlist_t **data) } } - if(handle->sysupgrade) { + if(m_handle->sysupgrade) { _pacman_runhook("post_sysupgrade", this); } retval = 0; @@ -1780,7 +1783,7 @@ int __pmtrans_t::commit(pmlist_t **data) remain = _pacman_list_count(targ); - if(handle->trans->state == STATE_INTERRUPTED) { + if(m_handle->trans->state == STATE_INTERRUPTED) { break; } @@ -1830,7 +1833,7 @@ int __pmtrans_t::commit(pmlist_t **data) if(type & PM_TRANS_TYPE_ADD) { if(pkg_new->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _pacman_runscriptlet(handle->root, pkg_new->path(), trans_event_table[type].pre.hook, pkg_new->version(), pkg_local ? pkg_local->version() : NULL, this); + _pacman_runscriptlet(m_handle->root, pkg_new->path(), trans_event_table[type].pre.hook, pkg_new->version(), pkg_local ? pkg_local->version() : NULL, this); } } @@ -1840,7 +1843,7 @@ int __pmtrans_t::commit(pmlist_t **data) /* run the pre-remove scriptlet if it exists */ if(pkg_local->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name(), pkg_local->version()); - _pacman_runscriptlet(handle->root, pm_install, "pre_remove", pkg_local->version(), NULL, this); + _pacman_runscriptlet(m_handle->root, pm_install, "pre_remove", pkg_local->version(), NULL, this); } } @@ -1853,9 +1856,9 @@ int __pmtrans_t::commit(pmlist_t **data) /* run the post-remove script if it exists */ if(pkg_local->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { /* must run ldconfig here because some scriptlets fail due to missing libs otherwise */ - _pacman_ldconfig(handle->root); + _pacman_ldconfig(m_handle->root); snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db_local->path, pkg_local->name(), pkg_local->version()); - _pacman_runscriptlet(handle->root, pm_install, "post_remove", pkg_local->version(), NULL, this); + _pacman_runscriptlet(m_handle->root, pm_install, "post_remove", pkg_local->version(), NULL, this); } } @@ -2009,9 +2012,9 @@ int __pmtrans_t::commit(pmlist_t **data) /* run the post-install script if it exists */ if(pkg_new->scriptlet && !(flags & PM_TRANS_FLAG_NOSCRIPTLET)) { /* must run ldconfig here because some scriptlets fail due to missing libs otherwise */ - _pacman_ldconfig(handle->root); - snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db_local->treename, pkg_new->name(), pkg_new->version()); - _pacman_runscriptlet(handle->root, pm_install, trans_event_table[type].post.hook, pkg_new->version(), pkg_local ? pkg_local->version() : NULL, this); + _pacman_ldconfig(m_handle->root); + snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", m_handle->root, m_handle->dbpath, db_local->treename, pkg_new->name(), pkg_new->version()); + _pacman_runscriptlet(m_handle->root, pm_install, trans_event_table[type].post.hook, pkg_new->version(), pkg_local ? pkg_local->version() : NULL, this); } } @@ -2020,8 +2023,8 @@ int __pmtrans_t::commit(pmlist_t **data) } /* run ldconfig if it exists */ - if(handle->trans->state != STATE_INTERRUPTED) { - _pacman_ldconfig(handle->root); + if(m_handle->trans->state != STATE_INTERRUPTED) { + _pacman_ldconfig(m_handle->root); } } diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 9f4598e..6b5aacb 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -69,7 +69,7 @@ struct __pmtrans_t int add(const char *target, pmtranstype_t type, int flags); int (*set_state)(pmtrans_t *trans, int new_state); - libpacman::Handle *handle; + ::libpacman::Handle *m_handle; pmtranstype_t m_type; unsigned int flags; unsigned char state; diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index 3653531..5b58f2d 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -76,7 +76,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) /* Sanity checks */ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); - ASSERT((handle = trans->handle) != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); + ASSERT((handle = trans->m_handle) != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT((db_local = handle->db_local) != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT((dbs_sync = handle->dbs_sync) != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); diff --git a/lib/libpacman/util.cpp b/lib/libpacman/util.cpp index ebe0860..f506271 100644 --- a/lib/libpacman/util.cpp +++ b/lib/libpacman/util.cpp @@ -311,7 +311,7 @@ int _pacman_chroot_system(const char *cmdline, pmtrans_t *trans) } if(pid == 0) { FILE *pp; - const char *root = trans->handle->root; + const char *root = trans->m_handle->root; _pacman_log(PM_LOG_DEBUG, _("chrooting in %s"), root); if(chroot(root) != 0) { @@ -423,8 +423,8 @@ int _pacman_runhook(const char *hookname, pmtrans_t *trans) DIR *dir; struct dirent *ent; - hookdir = trans->handle->hooksdir; - root = trans->handle->root; + hookdir = trans->m_handle->hooksdir; + root = trans->m_handle->root; _pacman_log(PM_LOG_FLOW2, _("executing %s hooks..."), hookname); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
