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

31
bin/xbps-bin/transaction.c
View File

@@ -50,16 +50,26 @@ struct transaction {
static void
show_missing_deps(prop_array_t a)
{
prop_object_t obj;
size_t i;
const char *str;
fprintf(stderr,
"xbps-bin: unable to locate some required packages:\n");
fprintf(stderr, "xbps-bin: unable to locate some required packages:\n");
for (i = 0; i < prop_array_count(a); i++) {
obj = prop_array_get(a, i);
fprintf(stderr, " * Missing binary package for: %s\n",
prop_string_cstring_nocopy(obj));
prop_array_get_cstring_nocopy(a, i, &str);
fprintf(stderr, " * Missing binary package for: %s\n", str);
}
}
static void
show_conflicts(prop_array_t a)
{
size_t i;
const char *str;
fprintf(stderr, "xbps-bin: conflicting packages were found:\n");
for (i = 0; i < prop_array_count(a); i++) {
prop_array_get_cstring_nocopy(a, i, &str);
fprintf(stderr, " %s\n", str);
}
}
@@ -350,7 +360,7 @@ remove_pkg(const char *pkgname, bool recursive)
int
exec_transaction(bool yes, bool dry_run, bool show_download_urls)
{
prop_array_t mdeps;
prop_array_t mdeps, cflicts;
struct transaction *trans;
struct xbps_handle *xhp = xbps_handle_get();
int rv = 0;
@@ -366,6 +376,11 @@ exec_transaction(bool yes, bool dry_run, bool show_download_urls)
/* missing packages */
show_missing_deps(mdeps);
goto out;
} else if (rv == EAGAIN) {
/* conflicts */
cflicts = prop_dictionary_get(xhp->transd, "conflicts");
show_conflicts(cflicts);
goto out;
}
xbps_dbg_printf("Empty transaction dictionary: %s\n",
strerror(errno));