diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-30 20:56:26 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-09-05 16:55:45 +0300 |
commit | 1ad6dad8da0d51e9522f9d27cf48531fa23b24ba (patch) | |
tree | 4f53f85678348e605d282bad20b327653faa0729 /bpkg/package.cxx | |
parent | 7b5a0b55569331560f9cb6439ee818c3ce5d8428 (diff) |
Adapt to optional package revision
Diffstat (limited to 'bpkg/package.cxx')
-rw-r--r-- | bpkg/package.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bpkg/package.cxx b/bpkg/package.cxx index 0ac2577..563fc93 100644 --- a/bpkg/package.cxx +++ b/bpkg/package.cxx @@ -16,7 +16,7 @@ using namespace std; namespace bpkg { - const version wildcard_version (0, "0", nullopt, 0, 0); + const version wildcard_version (0, "0", nullopt, nullopt, 0); // available_package_id // @@ -290,7 +290,10 @@ namespace bpkg query q ( query::package::id.name == n && - compare_version_eq (query::package::id.version, v, true, false)); + compare_version_eq (query::package::id.version, + canonical_version (v), + true /* revision */, + false /* iteration */)); for (const auto& prf: db.query<package_repository_fragment> (q)) { @@ -306,7 +309,10 @@ namespace bpkg shared_ptr<selected_package> p (db.find<selected_package> (n)); if (p == nullptr || !p->src_root || - compare_version_ne (v, p->version, true, false)) + compare_version_ne (v, + p->version, + true /* revision */, + false /* iteration */)) return nullopt; string mc (sha256 (o, d / manifest_file)); |