emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "lib/transaction_ops.c: also check conflicts for pkgs without rdeps."

Browse Source 
This reverts commit e308097af5420ae64d1ef7cab5b997c405e4bc91.

package conflicts are checked in xbps_transaction_prepare() already.
This commit is contained in:
Juan RP 2014-07-12 16:25:12 +02:00
parent e308097af5
commit e35d2e9415
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/transaction_ops.c
View File

@ -192,10 +192,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall)
if (!xbps_dictionary_set_cstring_nocopy(pkg_repod, if (!xbps_dictionary_set_cstring_nocopy(pkg_repod,
"transaction", reason)) "transaction", reason))
return EINVAL; return EINVAL;
/*
* Check if package has matched conflicts.
*/
xbps_pkg_find_conflicts(xhp, unsorted, pkg_repod);
/* /*
* Add the pkg dictionary from repository's index dictionary into * Add the pkg dictionary from repository's index dictionary into
* the "unsorted" queue. * the "unsorted" queue.