jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

state: print missing package names on error 

especially important if the package requested from command line
does not exist. otherwise we would not print an error at all.
cute-signatures
Timo Teräs 2010-06-01 15:06:48 +03:00
parent 038b672061
commit 440cffef58
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_state.h
View File

@ -27,6 +27,7 @@ struct apk_state {
struct apk_database *db; struct apk_database *db;
struct list_head change_list_head; struct list_head change_list_head;
struct apk_package_array *conflicts; struct apk_package_array *conflicts;
struct apk_name_array *missing;
apk_name_state_t name[]; apk_name_state_t name[];
}; };

30
src/state.c
View File

@ -267,8 +267,13 @@ int apk_state_prune_dependency(struct apk_state *state,
if (ns_error(state->name[name->id])) { if (ns_error(state->name[name->id])) {
return -1; return -1;
} else if (pkg == NULL) { } else if (pkg == NULL) {
if (dep->result_mask != APK_DEPMASK_CONFLICT) if (dep->result_mask != APK_DEPMASK_CONFLICT) {
if (ns_pending(state->name[name->id])) {
state->name[name->id] = ns_from_pkg_non_pending(NULL);
*apk_name_array_add(&state->missing) = name;
}
return -1; return -1;
}
} else { } else {
if (!(apk_version_compare(pkg->version, dep->version) if (!(apk_version_compare(pkg->version, dep->version)
& dep->result_mask)) & dep->result_mask))
@ -826,16 +831,13 @@ void apk_state_print_errors(struct apk_state *state)
struct error_state es; struct error_state es;
int i, j, r; int i, j, r;
if (state->conflicts == NULL) for (i = 0; state->conflicts != NULL && i < state->conflicts->num; i++) {
return; if (i == 0)
apk_error("Unable to satisfy all dependencies:");
apk_error("Unable to satisfy all dependencies:");
for (i = 0; i < state->conflicts->num; i++) {
es.prevpkg = pkg = state->conflicts->item[i]; es.prevpkg = pkg = state->conflicts->item[i];
es.indent.x = es.indent.indent = es.indent.x = es.indent.indent =
printf(" %s-%s:", printf(" %s-%s:", pkg->name->name, pkg->version);
pkg->name->name, pkg->version);
for (j = 0; j < pkg->depends->num; j++) { for (j = 0; j < pkg->depends->num; j++) {
r = apk_state_lock_dependency(state, r = apk_state_lock_dependency(state,
&pkg->depends->item[j]); &pkg->depends->item[j]);
@ -848,6 +850,18 @@ void apk_state_print_errors(struct apk_state *state)
print_dep, &es); print_dep, &es);
printf("\n"); printf("\n");
} }
for (i = 0; state->missing != NULL && i < state->missing->num; i++) {
struct apk_name *name = state->missing->item[i];
if (i == 0) {
apk_error("Missing packages:");
es.indent.x = 0;
es.indent.indent = 2;
}
apk_print_indented(&es.indent, APK_BLOB_STR(name->name));
}
if (i != 0)
printf("\n");
} }
int apk_state_commit(struct apk_state *state, int apk_state_commit(struct apk_state *state,