diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-23 07:46:46 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-23 07:46:46 +0200 |
| commit | 9a753934f5124437c91cafcefc92c35f2a8f0cbe (patch) | |
| tree | b46f25a0662740cf167007ec8c13c870ceef0aa5 /bpkg/satisfaction.cxx | |
| parent | 0575b8704ef23f64f73ab0424a2dfc322937a053 (diff) | |
Revert revision ignoring in satisfy(constraint, constraint)
Diffstat (limited to 'bpkg/satisfaction.cxx')
| -rw-r--r-- | bpkg/satisfaction.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bpkg/satisfaction.cxx b/bpkg/satisfaction.cxx index c53e64b..a0ebbfb 100644 --- a/bpkg/satisfaction.cxx +++ b/bpkg/satisfaction.cxx @@ -42,8 +42,8 @@ namespace bpkg { assert (!l.empty () && !r.empty ()); - // See notes in pkg-build:find_available() on ignoring revision in - // comparison. + // Note: the revision ignoring logic is still unclear/unimplemented. It + // seems it will be specific to each case below. // bool s (false); @@ -51,8 +51,7 @@ namespace bpkg { if (r.min_version) { - int i (l.min_version->compare (*r.min_version, - r.min_version->revision == 0)); + int i (l.min_version->compare (*r.min_version, false)); if (l.min_open) // Doesn't matter if r is min_open or not. // @@ -72,8 +71,7 @@ namespace bpkg { if (r.max_version) { - int i (l.max_version->compare (*r.max_version, - r.max_version->revision == 0)); + int i (l.max_version->compare (*r.max_version, false)); if (l.max_open) // Doesn't matter if r is max_open or not. // |