feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UpdateInfo: Fix status of progress bar

Browse Source 
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>
This commit is contained in:
Eike Ziller
2016-04-25 11:48:06 +02:00
parent ba75cf8b6d
commit 728229690a
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -33,6 +33,7 @@
#include <coreplugin/settingsdatabase.h> #include <coreplugin/settingsdatabase.h>
#include <coreplugin/shellcommand.h> #include <coreplugin/shellcommand.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/synchronousprocess.h>
#include <QDate> #include <QDate>
#include <QDomDocument> #include <QDomDocument>
@@ -60,6 +61,13 @@ using namespace Core;
namespace UpdateInfo { namespace UpdateInfo {
namespace Internal { namespace Internal {
class IgnoreExitCode : public Utils::ExitCodeInterpreter
{
public:
IgnoreExitCode(QObject *parent);
Utils::SynchronousProcessResponse::Result interpretExitCode(int code) const override;
};
class UpdateInfoPluginPrivate class UpdateInfoPluginPrivate
{ {
public: public:
@@ -76,6 +84,16 @@ public:
QDate m_lastCheckDate; 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() UpdateInfoPlugin::UpdateInfoPlugin()
: d(new UpdateInfoPluginPrivate) : d(new UpdateInfoPluginPrivate)
@@ -128,7 +146,8 @@ void UpdateInfoPlugin::startCheckForUpdates()
d->m_checkUpdatesCommand = new ShellCommand(QString(), env); d->m_checkUpdatesCommand = new ShellCommand(QString(), env);
connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput); connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput);
connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished); 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(); d->m_checkUpdatesCommand->execute();
emit checkForUpdatesRunningChanged(true); emit checkForUpdatesRunningChanged(true);
} }