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

Maemo: Improve clean-up behaviour on remote hosts.

Browse Source 
We now remove files we have created on the device because they are
temporarily needed. This includes package files, mount points and pipes.

Task-number: QTCREATORBUG-2709
This commit is contained in:
Christian Kandeler
2010-10-29 11:41:39 +02:00
parent 2a569ce073
commit 946cce3706
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -387,7 +387,7 @@ void MaemoDeployStep::handleSftpJobFinished(Core::SftpJobId,
.arg(filePathNative));
const QString remoteFilePath
= uploadDir() + QLatin1Char('/') + QFileInfo(filePathNative).fileName();
runDpkg(remoteFilePath);
runDpkg(remoteFilePath, true);
}
void MaemoDeployStep::handleMounted()
@@ -400,7 +400,7 @@ void MaemoDeployStep::handleMounted()
if (m_needsInstall) {
const QString remoteFilePath = deployMountPoint() + QLatin1Char('/')
+ QFileInfo(packagingStep()->packageFilePath()).fileName();
runDpkg(remoteFilePath);
runDpkg(remoteFilePath, false);
} else {
copyNextFileToDevice();
}
@@ -605,11 +605,14 @@ void MaemoDeployStep::unmountOldDirs()
m_mounter->unmount();
}
void MaemoDeployStep::runDpkg(const QString &packageFilePath)
void MaemoDeployStep::runDpkg(const QString &packageFilePath,
bool removeAfterInstall)
{
writeOutput(tr("Installing package to device..."));
const QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8() + " dpkg -i "
QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8() + " dpkg -i "
+ packageFilePath.toUtf8();
if (removeAfterInstall)
cmd += " && rm " + packageFilePath.toUtf8() + " || :";
m_deviceInstaller = m_connection->createRemoteProcess(cmd);
connect(m_deviceInstaller.data(), SIGNAL(closed(int)), this,
SLOT(handleInstallationFinished(int)));