From 728229690af3a5357c59790b58e10e9edddb3756 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 25 Apr 2016 11:48:06 +0200
Subject: [PATCH] UpdateInfo: Fix status of progress bar

MaintenanceTool returns with exit status != 0 in case there are no updates,
so that is no indicator of failure.

Change-Id: Ibe94cc8b5ecbd7a04be5da41112a4eda0cd84153
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/updateinfo/updateinfoplugin.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index b6c9d3b1464..d17bcfe5b2f 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -33,6 +33,7 @@
 #include <coreplugin/settingsdatabase.h>
 #include <coreplugin/shellcommand.h>
 #include <utils/fileutils.h>
+#include <utils/synchronousprocess.h>
 
 #include <QDate>
 #include <QDomDocument>
@@ -60,6 +61,13 @@ using namespace Core;
 namespace UpdateInfo {
 namespace Internal {
 
+class IgnoreExitCode : public Utils::ExitCodeInterpreter
+{
+public:
+    IgnoreExitCode(QObject *parent);
+    Utils::SynchronousProcessResponse::Result interpretExitCode(int code) const override;
+};
+
 class UpdateInfoPluginPrivate
 {
 public:
@@ -76,6 +84,16 @@ public:
     QDate m_lastCheckDate;
 };
 
+IgnoreExitCode::IgnoreExitCode(QObject *parent)
+    : Utils::ExitCodeInterpreter(parent)
+{
+}
+
+Utils::SynchronousProcessResponse::Result IgnoreExitCode::interpretExitCode(int code) const
+{
+    Q_UNUSED(code)
+    return Utils::SynchronousProcessResponse::Finished;
+}
 
 UpdateInfoPlugin::UpdateInfoPlugin()
     : d(new UpdateInfoPluginPrivate)
@@ -128,7 +146,8 @@ void UpdateInfoPlugin::startCheckForUpdates()
     d->m_checkUpdatesCommand = new ShellCommand(QString(), env);
     connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput);
     connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished);
-    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")));
+    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")),
+                                     /*workingDirectory=*/QString(), new IgnoreExitCode(d->m_checkUpdatesCommand));
     d->m_checkUpdatesCommand->execute();
     emit checkForUpdatesRunningChanged(true);
 }