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

TarPackageDeployStep: Get rid of isDeploymentNecessary()

Browse Source 
Make it a part of deployRecipe().

Change-Id: I131cb34171e3d4e09c6e8fa8a13dbfd768d55aa4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2023-10-23 17:13:41 +02:00
parent b8535e4cf1
commit df24000580
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/remotelinux/tarpackagedeploystep.cpp
View File

@@ -53,7 +53,6 @@ public:
private: private:
QString remoteFilePath() const; QString remoteFilePath() const;
bool isDeploymentNecessary() const final;
GroupItem deployRecipe() final; GroupItem deployRecipe() final;
GroupItem uploadTask(); GroupItem uploadTask();
GroupItem installTask(); GroupItem installTask();
@@ -66,11 +65,6 @@ QString TarPackageDeployStep::remoteFilePath() const
return QLatin1String("/tmp/") + m_packageFilePath.fileName(); return QLatin1String("/tmp/") + m_packageFilePath.fileName();
} }
bool TarPackageDeployStep::isDeploymentNecessary() const
{
return hasLocalFileChanged(DeployableFile(m_packageFilePath, {}));
}
GroupItem TarPackageDeployStep::uploadTask() GroupItem TarPackageDeployStep::uploadTask()
{ {
const auto setupHandler = [this](FileTransfer &transfer) { const auto setupHandler = [this](FileTransfer &transfer) {
@@ -117,7 +111,13 @@ GroupItem TarPackageDeployStep::installTask()
GroupItem TarPackageDeployStep::deployRecipe() GroupItem TarPackageDeployStep::deployRecipe()
{ {
return Group { uploadTask(), installTask() }; const auto onSetup = [this] {
if (hasLocalFileChanged(DeployableFile(m_packageFilePath, {})))
return SetupResult::Continue;
addSkipDeploymentMessage();
return SetupResult::StopWithDone;
};
return Group { onGroupSetup(onSetup), uploadTask(), installTask() };
} }