diff options
author | Timo Teräs <timo.teras@iki.fi> | 2013-06-13 18:20:39 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2013-06-13 18:22:00 +0300 |
commit | e51232e710dfd32764e2c2d0599df83ab85a9c74 (patch) | |
tree | 5eac93c05cf2fe77d2857a48a9fc55c7bf7e33d0 /src/apk_package.h | |
parent | 25ff68a87e3264b6dfdc846823d4912b4dd870b2 (diff) | |
download | apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.gz apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.bz2 apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.tar.xz apk-tools-e51232e710dfd32764e2c2d0599df83ab85a9c74.zip |
errors: rewrite the logic how errors are reported
Instead of the dependency oriented logic, switch to print them
for each package or name needed. Might give a bit more readable
errors now. There's still few corner cases that proper error is
not output, which are cought by the test cases.
Diffstat (limited to 'src/apk_package.h')
-rw-r--r-- | src/apk_package.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/apk_package.h b/src/apk_package.h index a5cda2f..44e463c 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -37,6 +37,10 @@ struct apk_provider; #define APK_SIGN_GENERATE 4 #define APK_SIGN_VERIFY_AND_GENERATE 5 +#define APK_DEP_IRRELEVANT 0 +#define APK_DEP_SATISFIED 1 +#define APK_DEP_CONFLICTED 2 + struct apk_sign_ctx { int keys_fd; int action; @@ -129,6 +133,8 @@ void apk_dep_from_pkg(struct apk_dependency *dep, struct apk_database *db, int apk_dep_is_materialized(struct apk_dependency *dep, struct apk_package *pkg); int apk_dep_is_materialized_or_provided(struct apk_dependency *dep, struct apk_package *pkg); int apk_dep_is_provided(struct apk_dependency *dep, struct apk_provider *p); +int apk_dep_analyze(struct apk_dependency *dep, struct apk_package *pkg); +char *apk_dep_snprintf(char *buf, size_t n, struct apk_dependency *dep); void apk_blob_push_dep(apk_blob_t *to, struct apk_database *, struct apk_dependency *dep); void apk_blob_push_deps(apk_blob_t *to, struct apk_database *, struct apk_dependency_array *deps); |