Commit 65826761 authored by Timo Teräs's avatar Timo Teräs

various: use APK_DEPMASK_REQUIRE where applicable

.. instead of the longer flag combo.
parent 59d222d5
......@@ -193,7 +193,7 @@ int apk_dep_from_blob(struct apk_dependency *dep, struct apk_database *db,
{
struct apk_name *name;
apk_blob_t bname, bop, bver = APK_BLOB_NULL;
int mask = APK_VERSION_LESS | APK_VERSION_EQUAL | APK_VERSION_GREATER;
int mask = APK_DEPMASK_REQUIRE;
/* [!]name[<,<=,=,>=,>]ver */
if (blob.ptr[0] == '!') {
......
......@@ -43,7 +43,7 @@ int apk_do_self_upgrade(struct apk_database *db, struct apk_state *state)
if (dep0->name != dep.name)
continue;
dep0->version = apk_blob_atomize(APK_BLOB_NULL);
dep0->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER;
dep0->result_mask = APK_DEPMASK_REQUIRE;
break;
}
}
......@@ -94,7 +94,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
struct apk_dependency *dep = &db->world->item[i];
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_DEPMASK_REQUIRE;
dep->version = null_atom;
}
if (dep->name->pkgs->num != 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment