diff options
Diffstat (limited to 'src/upgrade.c')
| -rw-r--r-- | src/upgrade.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/upgrade.c b/src/upgrade.c index 795e62f..ec0dc91 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -33,21 +33,10 @@ static int upgrade_parse(void *ctx, struct apk_db_options *dbopts, int apk_do_self_upgrade(struct apk_database *db, struct apk_state *state) { struct apk_dependency dep; - int r, i; + int r; apk_dep_from_blob(&dep, db, APK_BLOB_STR("apk-tools")); - if (apk_flags & APK_PREFER_AVAILABLE) { - for (i = 0; i < db->world->num; i++) { - struct apk_dependency *dep0 = &db->world->item[i]; - if (dep0->name != dep.name) - continue; - dep0->version = apk_blob_atomize(APK_BLOB_NULL); - dep0->result_mask = APK_DEPMASK_REQUIRE; - break; - } - } - r = apk_state_lock_dependency(state, &dep); if (r != 0 || state->num_changes == 0) return r; @@ -57,13 +46,13 @@ int apk_do_self_upgrade(struct apk_database *db, struct apk_state *state) return 0; } - apk_message("Uprading first to new apk-tools:"); + apk_message("Upgrading critical system libraries and apk-tools:"); state->print_ok = 0; - r = apk_state_commit(state, db); + r = apk_state_commit(state); apk_state_unref(state); apk_db_close(db); - apk_message("Performing rest of the operation:"); + apk_message("Continuing the upgrade transaction with new apk-tools:"); execvp(apk_argv[0], apk_argv); apk_error("PANIC! Failed to re-execute new apk-tools!"); @@ -74,7 +63,6 @@ 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; @@ -92,11 +80,7 @@ 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 != null_atom && - (apk_flags & APK_PREFER_AVAILABLE)) { - dep->result_mask = APK_DEPMASK_REQUIRE; - dep->version = null_atom; - } + if (dep->name->pkgs->num != 0) r |= apk_state_lock_dependency(state, dep); else @@ -117,7 +101,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg if (i != 0) printf("\n"); - r = apk_state_commit(state, db); + r = apk_state_commit(state); } else apk_state_print_errors(state); err: |