napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Fallback from status -> description -> name for progress

Browse Source
This commit is contained in:
Adriaan de Groot 2020-10-13 00:00:37 +02:00
parent 2f83d85e29
commit 86fd014bbd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcalamares/JobQueue.cpp
View File

@ -177,6 +177,18 @@ private:
const auto& jobitem = m_runningJobs->at( m_jobIndex );
progress = ( jobitem.cumulative + jobitem.weight * percentage ) / m_overallQueueWeight;
message = jobitem.job->prettyStatusMessage();
// In progress reports at the start of a job (e.g. when the queue
// starts the job, or if the job itself reports 0.0) be more
// accepting in what gets reported: jobs with no status fall
// back to description and name, whichever is non-empty.
if ( percentage == 0.0 && message.isEmpty() )
{
message = jobitem.job->prettyDescription();
if ( message.isEmpty() )
{
message = jobitem.job->prettyName();
}
}
}
else
{