Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further cleanup around source check timestamps

Browse Source
This commit is contained in:
Simon Quigley 2025-01-29 13:20:48 -06:00
parent d6fa2d3792
commit 03fdd33084
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpp/ci_database_objs.cpp
View File

@ -897,8 +897,8 @@ void PackageConf::sync() {
} }
bool PackageConf::can_check_source_upload() { bool PackageConf::can_check_source_upload() {
int _successful_task_count = successful_task_count(); int _total_task_count = total_task_count();
if (_successful_task_count == 0) return false; if (_total_task_count == 0) return false;
std::int64_t upload_timestamp = 0; std::int64_t upload_timestamp = 0;
std::int64_t source_check_timestamp = 0; std::int64_t source_check_timestamp = 0;
@ -909,7 +909,7 @@ bool PackageConf::can_check_source_upload() {
auto &jobstatus = kv.first; auto &jobstatus = kv.first;
auto &task_ptr = kv.second; auto &task_ptr = kv.second;
if (valid_successful_statuses.contains(jobstatus->name)) _successful_task_count--; if (valid_successful_statuses.contains(jobstatus->name)) _total_task_count--;
if (jobstatus->name == "upload" && task_ptr && task_ptr->successful) { if (jobstatus->name == "upload" && task_ptr && task_ptr->successful) {
upload_timestamp = task_ptr->finish_time; upload_timestamp = task_ptr->finish_time;
@ -917,13 +917,13 @@ bool PackageConf::can_check_source_upload() {
} }
if (jobstatus->name == "source_check" && task_ptr) { if (jobstatus->name == "source_check" && task_ptr) {
if (task_ptr->successful) source_check_timestamp = task_ptr->finish_time; source_check_timestamp = task_ptr->finish_time;
_successful_task_count--; _total_task_count--;
continue; continue;
} }
} }
} }
bool all_req_tasks_present = _successful_task_count == 0; bool all_req_tasks_present = _total_task_count == 0;
if (!all_req_tasks_present || (upload_timestamp == 0 && source_check_timestamp == 0)) { if (!all_req_tasks_present || (upload_timestamp == 0 && source_check_timestamp == 0)) {
return false; return false;
} else if (all_req_tasks_present && upload_timestamp != 0 && source_check_timestamp == 0) { } else if (all_req_tasks_present && upload_timestamp != 0 && source_check_timestamp == 0) {