diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-27 23:06:46 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-28 20:18:39 +0300 |
| commit | d4aef182ebc55091c02659b7549487d928eaec28 (patch) | |
| tree | 881d1d8bedbc7f88fe22a9437cce6433cfd7122d /mod/mod-builds.cxx | |
| parent | 8054f2973d453b71806f52f0bb30725cb31d64dd (diff) | |
Build packages for different toolchains having same version but different names
Diffstat (limited to 'mod/mod-builds.cxx')
| -rw-r--r-- | mod/mod-builds.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx index 187f9b8..d7bebd0 100644 --- a/mod/mod-builds.cxx +++ b/mod/mod-builds.cxx @@ -149,8 +149,9 @@ build_query (const brep::cstrings* configs, string tn (tc, 0, p); version tv (string (tc, p + 1)); // May throw invalid_argument. - q = q && qb::toolchain_name == tn && - compare_version_eq (qb::id.toolchain_version, tv, true); + q = q && + qb::id.toolchain_name == tn && + compare_version_eq (qb::id.toolchain_version, tv, true); } // Build configuration name. @@ -358,7 +359,7 @@ handle (request& rq, response& rs) toolchains r; for (auto& t: build_db_->query<toolchain> ( (tn ? query::build::id.package.tenant == *tn : query (true)) + - "ORDER BY" + query::build::toolchain_name + + "ORDER BY" + query::build::id.toolchain_name + order_by_version_desc (query::build::id.toolchain_version, false))) r.emplace_back (move (t.name), move (t.version)); |