Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d743d707cd414f6a0f9b0c32f095e1077b591d13
commit d743d707cd414f6a0f9b0c32f095e1077b591d13 Author: Michel Hermier <[email protected]> Date: Tue Sep 23 22:46:19 2014 +0200 libpacman: Drop pmtrans_t::m_packages. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index affd383..50c957e 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -115,15 +115,14 @@ FPtrList &_pacman_depmisslist_add(FPtrList &misslist, pmdepmissing_t *miss) * This function returns the new FPtrList* target list. * */ -FList<Package *> pmtrans_t::sortbydeps(int mode) +void pmtrans_t::sortbydeps(int mode) { - FList<Package *> newtargs; FList<pmgraph_t *> vertices; pmgraph_t *vertex; int found; if(syncpkgs.empty()) { - return newtargs; + return; } _pacman_log(PM_LOG_DEBUG, _("started sorting dependencies")); @@ -175,7 +174,6 @@ FList<Package *> pmtrans_t::sortbydeps(int mode) } if(!found) { syncpkgs.add(vertex->data); - newtargs.add(vertex->data->pkg_new != NULL ? vertex->data->pkg_new : vertex->data->pkg_local); /* mark that we've left this vertex */ vertex->state = 1; vertex = vertex->parent; @@ -194,9 +192,7 @@ FList<Package *> pmtrans_t::sortbydeps(int mode) if(mode == PM_TRANS_TYPE_REMOVE) { /* we're removing packages, so reverse the order */ syncpkgs.reverse(); - newtargs.reverse(); } - return newtargs; } /* Returns a FPtrList* of missing_t pointers. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 0994bee..3bd2400 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -501,18 +501,7 @@ int __pmtrans_t::prepare(FPtrList **data) } /* re-order w.r.t. dependencies */ - FList<pmsyncpkg_t *> l; - FList<Package *> m = sortbydeps(); - for(auto i = m.begin(), end = m.end(); i != end; ++i) { - for(auto j = syncpkgs.begin(), j_end = syncpkgs.end(); j != j_end; ++j) { - pmsyncpkg_t *s = *j; - if(s->pkg_new == *i) { - l.add(s); - } - } - } - syncpkgs.clear(); - syncpkgs.swap(l); + sortbydeps(); EVENT(this, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL); @@ -803,8 +792,6 @@ cleanup: } } else { - m_packages = packages(); - if(!(flags & PM_TRANS_FLAG_NODEPS)) { /* Check dependencies */ @@ -863,7 +850,7 @@ cleanup: } /* re-order w.r.t. dependencies */ _pacman_log(PM_LOG_FLOW1, _("sorting by dependencies")); - m_packages = sortbydeps(m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); + sortbydeps(m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); EVENT(this, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); } @@ -1854,23 +1841,4 @@ bool __pmtrans_t::empty() const return syncpkgs.empty(); } -FList<Package *> pmtrans_t::packages() const -{ - FList<Package *> ret; - - for(auto i = syncpkgs.begin(), end = syncpkgs.end(); i != end; ++i) { - pmsyncpkg_t *syncpkg = *i; - switch(syncpkg->type) { - case PM_TRANS_TYPE_ADD: - case PM_TRANS_TYPE_UPGRADE: - case PM_TRANS_TYPE_SYNC: - ret.add(syncpkg->pkg_new); - break; - case PM_TRANS_TYPE_REMOVE: - ret.add(syncpkg->pkg_local); - } - } - return ret; -} - /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/trans.h b/lib/libpacman/trans.h index 1df39bb..0088f51 100644 --- a/lib/libpacman/trans.h +++ b/lib/libpacman/trans.h @@ -73,10 +73,7 @@ struct __pmtrans_t FPtrList find_conflicts(); void removedeps(); int resolvedeps(FPtrList **data); - FList<libpacman::Package *> sortbydeps(int mode = PM_TRANS_TYPE_ADD); - - /* Compatibility */ - FList<libpacman::Package *> packages() const; + void sortbydeps(int mode = PM_TRANS_TYPE_ADD); /* Capacity */ bool empty() const; @@ -87,7 +84,6 @@ struct __pmtrans_t int flags; unsigned char state; FStringList targets; - FList<libpacman::Package *> m_packages; FList<pmsyncpkg_t *> syncpkgs; FStringList skiplist; FStringList triggers; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
