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

Added support for package conflicts.

Browse Source
This commit is contained in:
Juan RP
2012-06-11 16:14:03 +02:00
parent 81610697df
commit c61ba8dfcc
10 changed files with 151 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/transaction_dictionary.c
View File

@@ -190,7 +190,7 @@ out:
int HIDDEN
xbps_transaction_init(struct xbps_handle *xhp)
{
prop_array_t unsorted, mdeps;
prop_array_t unsorted, mdeps, conflicts;
if (xhp->transd != NULL)
return 0;
@@ -218,6 +218,16 @@ xbps_transaction_init(struct xbps_handle *xhp)
xhp->transd = NULL;
return EINVAL;
}
if ((conflicts = prop_array_create()) == NULL) {
prop_object_release(xhp->transd);
xhp->transd = NULL;
return ENOMEM;
}
if (!xbps_add_obj_to_dict(xhp->transd, conflicts, "conflicts")) {
prop_object_release(xhp->transd);
xhp->transd = NULL;
return EINVAL;
}
return 0;
}
@@ -225,7 +235,7 @@ xbps_transaction_init(struct xbps_handle *xhp)
int
xbps_transaction_prepare(void)
{
prop_array_t mdeps;
prop_array_t mdeps, conflicts;
struct xbps_handle *xhp = xbps_handle_get();
int rv = 0;
@@ -239,6 +249,13 @@ xbps_transaction_prepare(void)
if (prop_array_count(mdeps) > 0)
return ENODEV;
/*
* If there are package conflicts bail out.
*/
conflicts = prop_dictionary_get(xhp->transd, "conflicts");
if (prop_array_count(conflicts) > 0)
return EAGAIN;
/*
* Check for packages to be replaced.
*/
@@ -266,9 +283,10 @@ xbps_transaction_prepare(void)
return rv;
}
/*
* The missing deps array is not necessary anymore.
* The missing deps and conflicts arrays are not necessary anymore.
*/
prop_dictionary_remove(xhp->transd, "missing_deps");
prop_dictionary_remove(xhp->transd, "conflicts");
prop_dictionary_make_immutable(xhp->transd);
return 0;