Commit 5720bc7f authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix potentially misleading deployment message.

We said "Deployment finished" even in the case of a previous error,
 which could be intepreted as a success message, confusing users.
parent 796ca5d5
......@@ -230,6 +230,7 @@ void MaemoDeployStep::raiseError(const QString &errorString)
{
emit addTask(Task(Task::Error, errorString, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
m_hasError = true;
emit error();
}
......@@ -339,6 +340,7 @@ void MaemoDeployStep::start()
Q_ASSERT(!m_needsInstall);
Q_ASSERT(m_filesToCopy.isEmpty());
m_installerStderr.clear();
m_hasError = false;
const MaemoPackageCreationStep * const pStep = packagingStep();
const QString hostName = m_cachedDeviceConfig->sshParameters().host;
if (pStep->isPackagingEnabled()) {
......@@ -506,7 +508,10 @@ void MaemoDeployStep::handleUnmounted()
m_portsGatherer->start(m_connection, m_cachedDeviceConfig->freePorts());
break;
case UnmountingCurrentMounts:
writeOutput(tr("Deployment finished."));
if (m_hasError)
writeOutput(tr("Deployment failed."), ErrorMessageOutput);
else
writeOutput(tr("Deployment finished."));
setState(Inactive);
break;
case Inactive:
......
......@@ -178,6 +178,7 @@ private:
MaemoPortList m_freePorts;
QByteArray m_installerStderr;
State m_state;
bool m_hasError;
};
class MaemoDeployEventHandler : public QObject
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment