Commit 9bd53be4 authored by ck's avatar ck
Browse files

Maemo: Get rid of two unneeded functions.

parent 3d656df2
......@@ -219,16 +219,6 @@ MaemoDeviceConfig MaemoDeployStep::deviceConfig() const
: MaemoDeviceConfig();
}
QString MaemoDeployStep::packageFileName() const
{
return QFileInfo(packageFilePath()).fileName();
}
QString MaemoDeployStep::packageFilePath() const
{
return packagingStep()->packageFilePath();
}
void MaemoDeployStep::start()
{
m_stopped = false;
......@@ -288,7 +278,7 @@ void MaemoDeployStep::handleSftpChannelInitialized()
const MaemoPackageCreationStep * const pStep = packagingStep();
const QString hostName = m_connection->connectionParameters().host;
if (pStep->isPackagingEnabled()) {
const MaemoDeployable d(packageFilePath(), uploadDir());
const MaemoDeployable d(pStep->packageFilePath(), uploadDir());
if (currentlyNeedsDeployment(hostName, d)) {
if (!deploy(MaemoDeployable(d)))
return;
......@@ -405,8 +395,10 @@ void MaemoDeployStep::handleLinkProcessFinished(int exitStatus)
if (m_linksInProgress.isEmpty() && m_uploadsInProgress.isEmpty()) {
if (m_needsInstall) {
writeOutput(tr("Installing package ..."));
const QString packageFileName
= QFileInfo(packagingStep()->packageFilePath()).fileName();
const QByteArray cmd = remoteSudo().toUtf8() + " dpkg -i "
+ packageFileName().toUtf8();
+ packageFileName.toUtf8();
m_installer = m_connection->createRemoteProcess(cmd);
connect(m_installer.data(), SIGNAL(closed(int)), this,
SLOT(handleInstallationFinished(int)));
......
......@@ -104,8 +104,6 @@ private:
const MaemoPackageCreationStep *packagingStep() const;
bool deploy(const MaemoDeployable &deployable);
QString uploadDir() const;
QString packageFileName() const;
QString packageFilePath() const;
static const QLatin1String Id;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment