From 22c900e7d57bfa7c9ed482f888ef200c0289ceec Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 9 Dec 2007 14:49:34 +0100 Subject: Add new public alpm_checkdbconflicts function. This function has a limited purpose, but might be interesting to do a sanity check from a frontend (eg testdb). Also removed the private _alpm_checkconflicts function to avoid confusion. This function was used only once in libalpm, in sync.c, and was just a single line anyway. Having to do it manually makes it explicit that we are looking for two kind of conflicts (targ vs targ and db vs targ). Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/sync.c') diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index da7a18fb..b8f472d0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -456,7 +456,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "looking for conflicts\n"); - deps = _alpm_checkconflicts(db_local, list); + deps = alpm_list_join(_alpm_innerconflicts(list), + _alpm_outerconflicts(db_local, list)); if(deps) { int errorout = 0; alpm_list_t *asked = NULL; -- cgit v1.2.3-54-g00ecf