diff options
| -rw-r--r-- | ext/repo_haiku.cpp | 4 | ||||
| -rw-r--r-- | src/pool.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/repo_haiku.cpp b/ext/repo_haiku.cpp index e5b448f..6aeec57 100644 --- a/ext/repo_haiku.cpp +++ b/ext/repo_haiku.cpp @@ -56,8 +56,8 @@ static void add_dependency(Repo *repo, Offset &dependencies, const char *name, if (compatVersion && compatVersion[0] != '\0') { - versionId = pool_rel2id(pool, pool_str2id(pool, compatVersion, 1), - versionId, REL_COMPAT, 1); + versionId = pool_rel2id(pool, versionID, pool_str2id(pool, compatVersion, 1), + REL_COMPAT, 1); } dependency = pool_rel2id(pool, dependency, versionId, flags, 1); @@ -652,13 +652,13 @@ pool_match_flags_evr(Pool *pool, int pflags, Id pevr, int flags, int evr) static int pool_match_flags_evr_rel_compat(Pool *pool, Reldep *range, int flags, int evr) { - /* range->name is the backwards compatibility version, range->evr the - actual version. If flags are '>=' or '>', we match the compatibility - version as well, otherwise only the actual version. */ + /* range->name is the actual version, range->evr the backwards compatibility + version. If flags are '>=' or '>', we match the compatibility version + as well, otherwise only the actual version. */ if (!(flags & REL_GT) || (flags & REL_LT)) - return pool_match_flags_evr(pool, REL_EQ, range->evr, flags, evr); - return pool_match_flags_evr(pool, REL_LT | REL_EQ, range->evr, flags, evr) && - pool_match_flags_evr(pool, REL_GT | REL_EQ, range->name, REL_EQ, evr); + return pool_match_flags_evr(pool, REL_EQ, range->name, flags, evr); + return pool_match_flags_evr(pool, REL_LT | REL_EQ, range->name, flags, evr) && + pool_match_flags_evr(pool, REL_GT | REL_EQ, range->evr, REL_EQ, evr); } #endif |