From e2dc0a2c07804a916edbc90d9fe67edcb07c26b8 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Mon, 18 Apr 2022 19:07:52 +0200 Subject: rbutil: Make zip install log less noisy. No need to show a separate entry when a cached file has been used, do it the same way as bootloader downloads do. Change-Id: I42a21a37474a778975e82af0102e0152677a0343 --- utils/rbutilqt/base/zipinstaller.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp index ba0b89121c..4ca8ce8688 100644 --- a/utils/rbutilqt/base/zipinstaller.cpp +++ b/utils/rbutilqt/base/zipinstaller.cpp @@ -116,14 +116,17 @@ void ZipInstaller::downloadDone(QNetworkReply::NetworkError error) emit done(true); return; } - if(m_getter->isCached()) - emit logItem(tr("Cached file used."), LOGINFO); if(error != QNetworkReply::NoError) { emit logItem(tr("Download error: %1").arg(m_getter->errorString()), LOGERROR); emit done(true); return; } - else emit logItem(tr("Download finished."),LOGOK); + else if(m_getter->isCached()) { + emit logItem(tr("Download finished (cache used)."), LOGOK); + } + else { + emit logItem(tr("Download finished."),LOGOK); + } QCoreApplication::processEvents(); if(m_unzip) { // unzip downloaded file -- cgit v1.2.3