diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/apk.c | 13 | ||||
| -rw-r--r-- | src/solver.c | 5 |
2 files changed, 12 insertions, 6 deletions
@@ -462,13 +462,16 @@ int main(int argc, char **argv) } for (i = 0; i < test_repos->num; i++) { struct apk_bstream *bs; - char *fn = test_repos->item[i]; + apk_blob_t spec = APK_BLOB_STR(test_repos->item[i]), name, tag; int repo_tag = 0; - if (fn[0] == '+') { - repo_tag = apk_db_get_tag_id(&db, APK_BLOB_STR("testing")); - fn++; + + if (apk_blob_split(spec, APK_BLOB_STR(":"), &tag, &name)) { + repo_tag = apk_db_get_tag_id(&db, tag); + } else { + name = spec; } - bs = apk_bstream_from_file(AT_FDCWD, fn); + + bs = apk_bstream_from_file(AT_FDCWD, name.ptr); if (bs != NULL) { apk_db_index_read(&db, bs, i); db.repo_tags[repo_tag].allowed_repos |= BIT(i); diff --git a/src/solver.c b/src/solver.c index 39f9683..d12ecff 100644 --- a/src/solver.c +++ b/src/solver.c @@ -356,7 +356,7 @@ static int get_topology_score( }; if (ss->solver_flags & APK_SOLVERF_AVAILABLE) { - /* not upgrading: it is not preferred to change package */ + /* available preferred */ if ((pkg->repos == 0) && ns->has_available_pkgs) score.non_preferred_actions++; } else if (ns->inherited_reinstall || @@ -364,6 +364,9 @@ static int get_topology_score( /* reinstall requested, but not available */ if (!pkg_available(ss->db, pkg)) score.non_preferred_actions++; + } else if (ns->inherited_upgrade || + ((ns->solver_flags_local|ss->solver_flags) & APK_SOLVERF_UPGRADE)) { + /* upgrading - score is just locked here */ } else if ((ns->inherited_upgrade == 0) && ((ns->solver_flags_local|ss->solver_flags) & APK_SOLVERF_UPGRADE) == 0 && ((ns->solver_flags_maybe & APK_SOLVERF_UPGRADE) == 0 || (ps->locked))) { |