Commit 70e801bb authored by ck's avatar ck
Browse files

Maemo: Handle missing specification for remote executable.

Reviewed-by: kh1
parent 05c55402
...@@ -139,7 +139,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl ...@@ -139,7 +139,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl
if (model->localExecutableFilePath() == localExecutableFilePath) if (model->localExecutableFilePath() == localExecutableFilePath)
return model->remoteExecutableFilePath(); return model->remoteExecutableFilePath();
} }
Q_ASSERT(!"Invalid local executable!"); qWarning("No remote executable specified!");
return QString(); return QString();
} }
......
...@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy() ...@@ -202,7 +202,7 @@ void AbstractMaemoRunControl::deploy()
m_sshDeployer->start(); m_sshDeployer->start();
} else { } else {
m_progress.reportFinished(); m_progress.reportFinished();
startExecution(); startExecutionIfPossible();
} }
} }
...@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const ...@@ -248,6 +248,16 @@ bool AbstractMaemoRunControl::isCleaning() const
return m_initialCleaner && m_initialCleaner->isRunning(); return m_initialCleaner && m_initialCleaner->isRunning();
} }
void AbstractMaemoRunControl::startExecutionIfPossible()
{
if (executableFilePathOnTarget().isEmpty()) {
handleError(tr("Cannot run: No remote executable set."));
emit finished();
} else {
startExecution();
}
}
void AbstractMaemoRunControl::startExecution() void AbstractMaemoRunControl::startExecution()
{ {
m_sshRunner.reset(new MaemoSshRunner(m_devConfig.server, remoteCall())); m_sshRunner.reset(new MaemoSshRunner(m_devConfig.server, remoteCall()));
...@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished() ...@@ -315,7 +325,7 @@ void AbstractMaemoRunControl::handleDeployThreadFinished()
emit finished(); emit finished();
} else { } else {
m_progress.reportFinished(); m_progress.reportFinished();
startExecution(); startExecutionIfPossible();
} }
} }
......
...@@ -109,6 +109,7 @@ private: ...@@ -109,6 +109,7 @@ private:
void startInitialCleanup(); void startInitialCleanup();
void killRemoteProcesses(const QStringList &apps, bool initialCleanup); void killRemoteProcesses(const QStringList &apps, bool initialCleanup);
void startExecutionIfPossible();
bool isCleaning() const; bool isCleaning() const;
bool isDeploying() const; bool isDeploying() const;
QString remoteSudo() const; QString remoteSudo() const;
......
Supports Markdown
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