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

xbps_transaction_prepare: check for unresolved shlibs a bit early.

Browse Source 
It's just better if we check for unresolved shlibs earlier because
the transaction array will be smaller if there are replaced packages.
This commit is contained in:
Juan RP 2014-11-13 11:39:20 +01:00
parent 805cabc1c4
commit 74c30556fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/transaction_dictionary.c
View File

@ -315,6 +315,12 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
array = xbps_dictionary_get(xhp->transd, "conflicts"); array = xbps_dictionary_get(xhp->transd, "conflicts");
if (xbps_array_count(array)) if (xbps_array_count(array))
return EAGAIN; return EAGAIN;
/*
* Check for unresolved shared libraries.
*/
if (xbps_transaction_shlibs(xhp, pkgs,
xbps_dictionary_get(xhp->transd, "missing_shlibs")))
return ENOEXEC;
/* /*
* Check for packages to be replaced. * Check for packages to be replaced.
*/ */
@ -323,12 +329,6 @@ xbps_transaction_prepare(struct xbps_handle *xhp)
xhp->transd = NULL; xhp->transd = NULL;
return rv; return rv;
} }
/*
* Check for unresolved shared libraries.
*/
if (xbps_transaction_shlibs(xhp, pkgs, xbps_dictionary_get(xhp->transd, "missing_shlibs")))
return ENOEXEC;
/* /*
* Add transaction stats for total download/installed size, * Add transaction stats for total download/installed size,
* number of packages to be installed, updated, configured * number of packages to be installed, updated, configured