From af86ba8dfc6e8815169a644e4b9a5070f33d401d Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 8 Jun 2011 15:00:58 +0200
Subject: [PATCH] RemoteLinux: Don't do a chmod on the executable before
running.
It does not seem to be necessary anymore, Harmattan does not support it,
and it was a hack in the first place.
Change-Id: I393fda9dbc45a9da5d270df3cfd0b90dbbfbdf2e
Reviewed-on: http://codereview.qt.nokia.com/386
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/remotelinux/maemoglobal.cpp | 6 ++----
src/plugins/remotelinux/maemoglobal.h | 3 +--
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/plugins/remotelinux/maemoglobal.cpp b/src/plugins/remotelinux/maemoglobal.cpp
index 29afa77e93b..95a90e04a62 100644
--- a/src/plugins/remotelinux/maemoglobal.cpp
+++ b/src/plugins/remotelinux/maemoglobal.cpp
@@ -170,11 +170,9 @@ QString MaemoGlobal::remoteSudo(const QString &osType, const QString &uname)
return QString(); // Using sudo would open a can of worms.
}
-QString MaemoGlobal::remoteCommandPrefix(const QString &osType, const QString &userName,
- const QString &commandFilePath)
+QString MaemoGlobal::remoteCommandPrefix(const QString &osType)
{
- QString prefix = QString::fromLocal8Bit("%1 chmod a+x %2; %3; ")
- .arg(remoteSudo(osType, userName), commandFilePath, remoteSourceProfilesCommand());
+ QString prefix = QString::fromLocal8Bit("%1; ").arg(remoteSourceProfilesCommand());
if (osType != LinuxDeviceConfiguration::Maemo5OsType
&& osType != LinuxDeviceConfiguration::HarmattanOsType) {
prefix += QLatin1String("DISPLAY=:0.0 ");
diff --git a/src/plugins/remotelinux/maemoglobal.h b/src/plugins/remotelinux/maemoglobal.h
index db87045754a..741f4baea1a 100644
--- a/src/plugins/remotelinux/maemoglobal.h
+++ b/src/plugins/remotelinux/maemoglobal.h
@@ -108,8 +108,7 @@ public:
static QString devrootshPath();
static int applicationIconSize(const QString &osType);
static QString remoteSudo(const QString &osType, const QString &uname);
- static QString remoteCommandPrefix(const QString &osType,
- const QString &userName, const QString &commandFilePath);
+ static QString remoteCommandPrefix(const QString &osType);
static QString remoteEnvironment(const QList<Utils::EnvironmentItem> &list);
static QString remoteSourceProfilesCommand();
static QString failedToConnectToServerMessage(const QSharedPointer<Utils::SshConnection> &connection,
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 4833e4e391a..8d70dac2e0a 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -310,8 +310,7 @@ QString RemoteLinuxRunConfiguration::commandPrefix() const
return QString();
return QString::fromLocal8Bit("%1 %2")
- .arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType(),
- deviceConfig()->sshParameters().userName, remoteExecutableFilePath()))
+ .arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType()))
.arg(MaemoGlobal::remoteEnvironment(userEnvironmentChanges()));
}
--
GitLab