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

RsyncDeployService: Remove setFinished()

Browse Source 
Use stopDeployment() instead. Simplify file transfer's
done handler.

Change-Id: Ib43d95c1498be590d1557fbe4fcaf2f2e79d08fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-11-22 10:55:53 +01:00
parent 0312bfc066
commit d2b887cfad
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/remotelinux/rsyncdeploystep.cpp
View File

@@ -42,7 +42,7 @@ public:
}
emit errorMessage(Tr::tr("Deploy via rsync: failed to create remote directories:")
+ '\n' + finalMessage);
setFinished();
stopDeployment();
return;
}
deployFiles();
@@ -53,18 +53,14 @@ public:
connect(&m_fileTransfer, &FileTransfer::progress,
this, &AbstractRemoteLinuxDeployService::stdOutData);
connect(&m_fileTransfer, &FileTransfer::done, this, [this](const ProcessResultData &result) {
auto notifyError = [this](const QString &message) {
emit errorMessage(message);
setFinished();
};
if (result.m_error == QProcess::FailedToStart)
notifyError(Tr::tr("rsync failed to start: %1").arg(result.m_errorString));
emit errorMessage(Tr::tr("rsync failed to start: %1").arg(result.m_errorString));
else if (result.m_exitStatus == QProcess::CrashExit)
notifyError(Tr::tr("rsync crashed."));
emit errorMessage(Tr::tr("rsync crashed."));
else if (result.m_exitCode != 0)
notifyError(Tr::tr("rsync failed with exit code %1.").arg(result.m_exitCode));
else
setFinished();
emit errorMessage(Tr::tr("rsync failed with exit code %1.").arg(result.m_exitCode));
stopDeployment();
});
}
@@ -76,11 +72,10 @@ private:
bool isDeploymentNecessary() const override;
void doDeploy() override;
void stopDeployment() override { setFinished(); };
void stopDeployment() override;
void createRemoteDirectories();
void deployFiles();
void setFinished();
mutable FilesToTransfer m_files;
bool m_ignoreMissingFiles = false;
@@ -128,7 +123,7 @@ void RsyncDeployService::deployFiles()
m_fileTransfer.start();
}
void RsyncDeployService::setFinished()
void RsyncDeployService::stopDeployment()
{
m_mkdir.close();
m_fileTransfer.stop();