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

SSH: Name SshRemoteProcess::ExitStatus values like the QProcess ones.

Browse Source 
(We cannot use QProcess::ExitStatus itself, because it does not contain
FailedToStart.)

Change-Id: I83ed6de621e2693e539562cd8e56ef478fa4fcb9
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Christian Kandeler
2012-06-08 08:23:32 +02:00
committed by hjk
parent 69a437873a
commit 303e67304e
21 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/remotelinux/sshkeydeployer.cpp
View File

@@ -88,13 +88,13 @@ void SshKeyDeployer::handleConnectionFailure()
void SshKeyDeployer::handleKeyUploadFinished(int exitStatus)
{
Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart
|| exitStatus == SshRemoteProcess::KilledBySignal
|| exitStatus == SshRemoteProcess::ExitedNormally);
|| exitStatus == SshRemoteProcess::CrashExit
|| exitStatus == SshRemoteProcess::NormalExit);
const int exitCode = d->deployProcess.processExitCode();
const QString errorMsg = d->deployProcess.processErrorString();
cleanup();
if (exitStatus == SshRemoteProcess::ExitedNormally && exitCode == 0)
if (exitStatus == SshRemoteProcess::NormalExit && exitCode == 0)
emit finishedSuccessfully();
else
emit error(tr("Key deployment failed: %1.").arg(errorMsg));