Skip to content

Commit 5127591

Browse files
Olav Herbst (hro2hi)OleksandrChaika
Olav Herbst (hro2hi)
authored andcommitted
in DBusRaucInstaller ignore rare progress "100% Checking bundle done."
1 parent ddd1ba6 commit 5127591

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Diff for: src/Install/DBusRaucInstaller.cpp

+10-4
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,16 @@ namespace sua {
279279
Logger::trace("Rauc Installer progress: {}% ({}) {}", progressPercentage, nesting, message);
280280
g_variant_unref(progressInfo);
281281

282-
// Installing failed?
283-
if(progressPercentage == 100 && g_strcmp0(message, "Installing done.")) {
284-
setSuccess(false);
285-
setInstalling(false);
282+
if(progressPercentage == 100 && nesting == 1) {
283+
if(!g_strcmp0(message, "Checking bundle done.")) {
284+
// ignore a rare previous 100% progress before this installation started
285+
progressPercentage = 0;
286+
}
287+
else if(g_strcmp0(message, "Installing done.")) {
288+
// Installing failed.
289+
setSuccess(false);
290+
setInstalling(false);
291+
}
286292
}
287293
} else {
288294
Logger::error("Connection to D-Bus lost? code = {}, message = {}",

0 commit comments

Comments
 (0)