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

TarPackageDeployService: Remove removePackageFile arg

Browse Source 
It was always true.

Change-Id: I9136e924ae15471e6ffc51fa475d965fb49a7df7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-11-22 16:21:29 +01:00
parent adc064d502
commit 2a830a12f2
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,9 +43,7 @@ private:
void setFinished(); void setFinished();
void installPackage(const IDeviceConstPtr &deviceConfig, void installPackage(const IDeviceConstPtr &deviceConfig, const QString &packageFilePath);
const QString &packageFilePath,
bool removePackageFile);
void cancelInstallation(); void cancelInstallation();
State m_state = Inactive; State m_state = Inactive;
@@ -78,15 +76,14 @@ TarPackageDeployService::TarPackageDeployService()
} }
void TarPackageDeployService::installPackage(const IDevice::ConstPtr &deviceConfig, void TarPackageDeployService::installPackage(const IDevice::ConstPtr &deviceConfig,
const QString &packageFilePath, bool removePackageFile) const QString &packageFilePath)
{ {
QTC_ASSERT(m_installer.state() == QProcess::NotRunning, return); QTC_ASSERT(m_installer.state() == QProcess::NotRunning, return);
m_device = deviceConfig; m_device = deviceConfig;
QString cmdLine = QLatin1String("cd / && tar xvf ") + packageFilePath; const QString cmdLine = QLatin1String("cd / && tar xvf ") + packageFilePath
if (removePackageFile) + " && (rm " + packageFilePath + " || :)";
cmdLine += QLatin1String(" && (rm ") + packageFilePath + QLatin1String(" || :)");
m_installer.setCommand({m_device->filePath("/bin/sh"), {"-c", cmdLine}}); m_installer.setCommand({m_device->filePath("/bin/sh"), {"-c", cmdLine}});
m_installer.start(); m_installer.start();
} }
@@ -160,7 +157,7 @@ void TarPackageDeployService::handleUploadFinished(const ProcessResultData &resu
m_state = Installing; m_state = Installing;
emit progressMessage(Tr::tr("Installing package to device...")); emit progressMessage(Tr::tr("Installing package to device..."));
installPackage(deviceConfiguration(), remoteFilePath, true); installPackage(deviceConfiguration(), remoteFilePath);
} }
void TarPackageDeployService::handleInstallationFinished(const QString &errorMsg) void TarPackageDeployService::handleInstallationFinished(const QString &errorMsg)