Split housekeeping tasks
This commit is contained in:
@@ -216,8 +216,9 @@ bool UpdateInterface::update()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((runParams->data.flags & UPDFLG_Housekeeping) && !housekeeping()) {
|
// perform before async install in case Companion restarted
|
||||||
reportProgress(tr("%1 housekeeping failed").arg(name), QtCriticalMsg);
|
if (!saveReleaseSettings()) {
|
||||||
|
reportProgress(tr("Failed to save release settings"), QtDebugMsg);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,6 +227,11 @@ bool UpdateInterface::update()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((runParams->data.flags & UPDFLG_Housekeeping) && !housekeeping()) {
|
||||||
|
reportProgress(tr("%1 housekeeping failed").arg(name), QtCriticalMsg);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
reportProgress(tr("%1 update successful").arg(name), QtInfoMsg);
|
reportProgress(tr("%1 update successful").arg(name), QtInfoMsg);
|
||||||
|
|
||||||
if (!progress)
|
if (!progress)
|
||||||
@@ -1311,12 +1317,7 @@ bool UpdateInterface::housekeeping()
|
|||||||
|
|
||||||
if (progress) {
|
if (progress) {
|
||||||
progress->setValue(cnt);
|
progress->setValue(cnt);
|
||||||
progress->setMaximum(3);
|
progress->setMaximum(2);
|
||||||
}
|
|
||||||
|
|
||||||
if (!saveReleaseSettings()) {
|
|
||||||
reportProgress(tr("Failed to save release settings"), QtDebugMsg);
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (progress)
|
if (progress)
|
||||||
|
|||||||
Reference in New Issue
Block a user