From df240005807afd6904dfefcd5f60bcc8b92ca22a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 23 Oct 2023 17:13:41 +0200 Subject: [PATCH] TarPackageDeployStep: Get rid of isDeploymentNecessary() Make it a part of deployRecipe(). Change-Id: I131cb34171e3d4e09c6e8fa8a13dbfd768d55aa4 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/tarpackagedeploystep.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/remotelinux/tarpackagedeploystep.cpp b/src/plugins/remotelinux/tarpackagedeploystep.cpp index 570ecdb958d..7475f47d479 100644 --- a/src/plugins/remotelinux/tarpackagedeploystep.cpp +++ b/src/plugins/remotelinux/tarpackagedeploystep.cpp @@ -53,7 +53,6 @@ public: private: QString remoteFilePath() const; - bool isDeploymentNecessary() const final; GroupItem deployRecipe() final; GroupItem uploadTask(); GroupItem installTask(); @@ -66,11 +65,6 @@ QString TarPackageDeployStep::remoteFilePath() const return QLatin1String("/tmp/") + m_packageFilePath.fileName(); } -bool TarPackageDeployStep::isDeploymentNecessary() const -{ - return hasLocalFileChanged(DeployableFile(m_packageFilePath, {})); -} - GroupItem TarPackageDeployStep::uploadTask() { const auto setupHandler = [this](FileTransfer &transfer) { @@ -117,7 +111,13 @@ GroupItem TarPackageDeployStep::installTask() 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() }; }