Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=aac7d18b73e9a8b9e4a4cf18d3b6f0157a707a81
commit aac7d18b73e9a8b9e4a4cf18d3b6f0157a707a81 Author: Michel Hermier <[email protected]> Date: Wed May 22 14:13:46 2013 +0200 libpacman: Remove bogus test (replace is not a bidirectional link), add fix that trigger the issue. diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index bd70dd5..2c25bbe 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -800,7 +800,7 @@ int _pacman_sync_prepare (pmtrans_t *trans, pmlist_t **data) /*EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);*/ if (trans->_packages) { _pacman_log(PM_LOG_FLOW1, _("checking dependencies of packages designated for removal")); - deps = _pacman_checkdeps (trans, PM_TRANS_TYPE_REMOVE, trans->_packages); + _pacman_trans_checkdeps (trans, &deps); if(deps) { int errorout = 0; for(i = deps; i; i = i->next) { diff --git a/pactest/tests/sync990.py b/pactest/tests/sync990.py deleted file mode 100644 index 1bf532c..0000000 --- a/pactest/tests/sync990.py +++ /dev/null @@ -1,20 +0,0 @@ -self.description = "Sync a package pulling a dependency conflicting with a target" - -sp1 = pmpkg("pkg1") -sp1.depends = ["pkg3"] - -sp2 = pmpkg("pkg2") - -sp3 = pmpkg("pkg3") -sp3.conflicts = ["pkg2"] -sp3.provides = ["pkg2"] - -for p in sp1, sp2, sp3: - self.addpkg2db("sync", p) - -self.args = "-S pkg1 pkg2" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_EXIST=pkg2") -self.addrule("!PKG_EXIST=pkg3") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
