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

various: fix breakage from converting dependency versions to atoms 

The version now needs to be initialized atom always, since it's
dereferenced in various places.
cute-signatures
Timo Teräs 2011-01-01 12:11:49 +02:00
parent aae0a563ed
commit b01d144c69
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/del.c
View File

@ -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])); name = apk_db_get_name(db, APK_BLOB_STR(argv[i]));
dep = (struct apk_dependency) { dep = (struct apk_dependency) {
.name = name, .name = name,
.version = apk_blob_atomize(APK_BLOB_NULL),
.result_mask = APK_DEPMASK_CONFLICT, .result_mask = APK_DEPMASK_CONFLICT,
}; };

1
src/fetch.c
View File

@ -178,6 +178,7 @@ static int fetch_main(void *ctx, struct apk_database *db, int argc, char **argv)
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
struct apk_dependency dep = (struct apk_dependency) { struct apk_dependency dep = (struct apk_dependency) {
.name = apk_db_get_name(db, APK_BLOB_STR(argv[i])), .name = apk_db_get_name(db, APK_BLOB_STR(argv[i])),
.version = apk_blob_atomize(APK_BLOB_NULL),
.result_mask = APK_DEPMASK_REQUIRE, .result_mask = APK_DEPMASK_REQUIRE,
}; };

1
src/info.c
View File

@ -115,6 +115,7 @@ static int info_who_owns(struct info_ctx *ctx, struct apk_database *db,
if (apk_verbosity < 1) { if (apk_verbosity < 1) {
dep = (struct apk_dependency) { dep = (struct apk_dependency) {
.name = pkg->name, .name = pkg->name,
.version = apk_blob_atomize(APK_BLOB_NULL),
.result_mask = APK_DEPMASK_REQUIRE, .result_mask = APK_DEPMASK_REQUIRE,
}; };
apk_deps_add(&deps, &dep); apk_deps_add(&deps, &dep);

1
src/state.c
View File

@ -523,6 +523,7 @@ static int reinstall_broken_package(struct apk_state *state,
{ {
struct apk_dependency dep0 = { struct apk_dependency dep0 = {
.name = pkg->name, .name = pkg->name,
.version = apk_blob_atomize(APK_BLOB_NULL),
.result_mask = APK_DEPMASK_REQUIRE, .result_mask = APK_DEPMASK_REQUIRE,
}; };
return apk_state_lock_dependency(state, &dep0); return apk_state_lock_dependency(state, &dep0);

6
src/upgrade.c
View File

@ -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_state *state = NULL;
struct apk_name_array *missing; struct apk_name_array *missing;
apk_blob_t *null_atom = apk_blob_atomize(APK_BLOB_NULL);
int i, r = 0; int i, r = 0;
apk_flags |= APK_UPGRADE; 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++) { for (i = 0; i < db->world->num; i++) {
struct apk_dependency *dep = &db->world->item[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->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER;
dep->version = NULL; dep->version = null_atom;
} }
if (dep->name->pkgs->num != 0) if (dep->name->pkgs->num != 0)
r |= apk_state_lock_dependency(state, dep); r |= apk_state_lock_dependency(state, dep);