diff options
| -rw-r--r-- | src/del.c | 1 | ||||
| -rw-r--r-- | src/fetch.c | 1 | ||||
| -rw-r--r-- | src/info.c | 1 | ||||
| -rw-r--r-- | src/state.c | 1 | ||||
| -rw-r--r-- | src/upgrade.c | 6 |
5 files changed, 8 insertions, 2 deletions
@@ -51,6 +51,7 @@ static int del_main(void *ctx, struct apk_database *db, int argc, char **argv) name = apk_db_get_name(db, APK_BLOB_STR(argv[i])); dep = (struct apk_dependency) { .name = name, + .version = apk_blob_atomize(APK_BLOB_NULL), .result_mask = APK_DEPMASK_CONFLICT, }; diff --git a/src/fetch.c b/src/fetch.c index 9c32a11..b67a189 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -178,6 +178,7 @@ static int fetch_main(void *ctx, struct apk_database *db, int argc, char **argv) for (i = 0; i < argc; i++) { struct apk_dependency dep = (struct apk_dependency) { .name = apk_db_get_name(db, APK_BLOB_STR(argv[i])), + .version = apk_blob_atomize(APK_BLOB_NULL), .result_mask = APK_DEPMASK_REQUIRE, }; @@ -115,6 +115,7 @@ static int info_who_owns(struct info_ctx *ctx, struct apk_database *db, if (apk_verbosity < 1) { dep = (struct apk_dependency) { .name = pkg->name, + .version = apk_blob_atomize(APK_BLOB_NULL), .result_mask = APK_DEPMASK_REQUIRE, }; apk_deps_add(&deps, &dep); diff --git a/src/state.c b/src/state.c index 61ff563..0471850 100644 --- a/src/state.c +++ b/src/state.c @@ -523,6 +523,7 @@ static int reinstall_broken_package(struct apk_state *state, { struct apk_dependency dep0 = { .name = pkg->name, + .version = apk_blob_atomize(APK_BLOB_NULL), .result_mask = APK_DEPMASK_REQUIRE, }; return apk_state_lock_dependency(state, &dep0); diff --git a/src/upgrade.c b/src/upgrade.c index b54d6c0..be6a499 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -34,6 +34,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg { struct apk_state *state = NULL; struct apk_name_array *missing; + apk_blob_t *null_atom = apk_blob_atomize(APK_BLOB_NULL); int i, r = 0; apk_flags |= APK_UPGRADE; @@ -45,9 +46,10 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg for (i = 0; i < db->world->num; i++) { struct apk_dependency *dep = &db->world->item[i]; - if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) { + if (dep->version != null_atom && + (apk_flags & APK_PREFER_AVAILABLE)) { dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER; - dep->version = NULL; + dep->version = null_atom; } if (dep->name->pkgs->num != 0) r |= apk_state_lock_dependency(state, dep); |