Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=610b2a2034882c22564d6362040f866b7322cfc1
commit 610b2a2034882c22564d6362040f866b7322cfc1 Author: Michel Hermier <[email protected]> Date: Tue Sep 23 18:33:45 2014 +0200 libpacman: Remove some more m_packages occurences. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index f724ddd..6ee919a 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -435,7 +435,6 @@ void pmtrans_t::removedeps() } } } - m_packages = packages(); } /* populates *list with packages that need to be installed to satisfy all diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index ea029f3..be9c48d 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -854,7 +854,6 @@ cleanup: RET_ERR(PM_ERR_CONFLICTING_DEPS, -1); } } - m_packages = packages(); if(m_type == PM_TRANS_TYPE_REMOVE && m_type != PM_TRANS_TYPE_UPGRADE) { if(flags & PM_TRANS_FLAG_RECURSE) { @@ -864,7 +863,7 @@ cleanup: } /* re-order w.r.t. dependencies */ _pacman_log(PM_LOG_FLOW1, _("sorting by dependencies")); - m_packages = sortbydeps(m_packages, m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); + m_packages = sortbydeps(packages(), m_type & PM_TRANS_TYPE_ADD ? PM_TRANS_TYPE_ADD : PM_TRANS_TYPE_REMOVE); EVENT(this, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
