diff options
Diffstat (limited to 'mod/mod-build-task.cxx')
| -rw-r--r-- | mod/mod-build-task.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx index 07aff8d..bf6f2dc 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -1032,7 +1032,7 @@ handle (request& rq, response& rs) const tenant_service_build_queued* tsq (nullptr); optional<pair<tenant_service, shared_ptr<build>>> tss; vector<build> qbs; - tenant_service_build_queued::build_queued_hints qhs; + tenant_service_base::build_hints bhs; optional<build_state> initial_state; bool rebuild_forced_build (false); bool rebuild_interrupted_rebuild (false); @@ -1104,14 +1104,14 @@ handle (request& rq, response& rs) return r; }; - auto queue_hints = [this] (const build_package& p) + auto build_hints = [this] (const build_package& p) { buildable_package_count tpc ( build_db_->query_value<buildable_package_count> ( query<buildable_package_count>::build_tenant::id == p.id.tenant)); - return tenant_service_build_queued::build_queued_hints { - tpc == 1, p.configs.size () == 1}; + return tenant_service_base::build_hints {tpc == 1, + p.configs.size () == 1}; }; // Collect the auxiliary machines required for testing of the specified @@ -1898,7 +1898,7 @@ handle (request& rq, response& rs) (*initial_state != build_state::queued && !rebuild_forced_build)) { - qhs = queue_hints (*p); + bhs = build_hints (*p); t->queued_timestamp = system_clock::now (); build_db_->update (t); @@ -2138,6 +2138,8 @@ handle (request& rq, response& rs) tsb = dynamic_cast<const tenant_service_build_building*> (s); tsq = dynamic_cast<const tenant_service_build_queued*> (s); + bhs = build_hints (*p); + if (tsq != nullptr) { qbs = queue_builds (*p, *b); @@ -2151,8 +2153,6 @@ handle (request& rq, response& rs) // if (!qbs.empty () || !rebuild_interrupted_rebuild) { - qhs = queue_hints (*p); - t->queued_timestamp = system_clock::now (); build_db_->update (t); } @@ -2229,7 +2229,7 @@ handle (request& rq, response& rs) if (auto f = tsq->build_queued (ss, qbs, nullopt /* initial_state */, - qhs, + bhs, log_writer_)) { if (optional<string> data = @@ -2253,7 +2253,7 @@ handle (request& rq, response& rs) if (auto f = tsq->build_queued (ss, qbs, initial_state, - qhs, + bhs, log_writer_)) { if (optional<string> data = |