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

RemoteLinux: It's not a fatal error when ports gathering fails.

Browse Source 
Change-Id: If803e1acaaa8164a5177fa5ca227516cc06c577c
Reviewed-on: http://codereview.qt.nokia.com/4364
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-09-07 15:43:11 +02:00
parent 7667e6d779
commit 5288267be0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
View File

@@ -333,8 +333,14 @@ void AbstractRemoteLinuxApplicationRunner::emitError(const QString &errorMsg, bo
void AbstractRemoteLinuxApplicationRunner::handlePortsGathererError(const QString &errorMsg) void AbstractRemoteLinuxApplicationRunner::handlePortsGathererError(const QString &errorMsg)
{ {
if (m_d->state != Inactive) if (m_d->state != Inactive) {
emitError(errorMsg); if (connection()->errorState() != SshNoError) {
emitError(errorMsg);
} else {
emit reportProgress(tr("Gathering ports failed: %1\nContinuing anyway.").arg(errorMsg));
handleUsedPortsAvailable();
}
}
} }
void AbstractRemoteLinuxApplicationRunner::handleUsedPortsAvailable() void AbstractRemoteLinuxApplicationRunner::handleUsedPortsAvailable()

4
src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp
View File

@@ -161,8 +161,8 @@ void RemoteLinuxUsedPortsGatherer::handleProcessClosed(int exitStatus)
if (m_d->procRunner->process()->exitCode() == 0) { if (m_d->procRunner->process()->exitCode() == 0) {
setupUsedPorts(); setupUsedPorts();
} else { } else {
errMsg = tr("Remote process failed: %1") errMsg = tr("Remote process failed; exit code was %1.")
.arg(m_d->procRunner->process()->errorString()); .arg(m_d->procRunner->process()->exitCode());
} }
break; break;
default: default: