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

SshParameters: Remove return value from setupSshEnvironment()

Browse Source 
Change-Id: I3e58454f23b5828991a5da1a88913f68d0f3ac9b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2024-06-24 09:17:32 +02:00
parent 595c2051d2
commit c3de8c7f31
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/devicesupport/sshparameters.cpp
View File

@@ -75,12 +75,11 @@ QStringList SshParameters::connectionOptions(const FilePath &binary) const
return args; return args;
} }
bool SshParameters::setupSshEnvironment(Process *process) void SshParameters::setupSshEnvironment(Process *process)
{ {
Environment env = process->controlEnvironment(); Environment env = process->controlEnvironment();
if (!env.hasChanges()) if (!env.hasChanges())
env = Environment::systemEnvironment(); env = Environment::systemEnvironment();
const bool hasDisplay = env.hasKey("DISPLAY") && (env.value("DISPLAY") != QString(":0"));
if (SshSettings::askpassFilePath().exists()) { if (SshSettings::askpassFilePath().exists()) {
env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput()); env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput());
env.set("SSH_ASKPASS_REQUIRE", "force"); env.set("SSH_ASKPASS_REQUIRE", "force");
@@ -93,7 +92,6 @@ bool SshParameters::setupSshEnvironment(Process *process)
// Otherwise, ssh will ignore SSH_ASKPASS and read from /dev/tty directly. // Otherwise, ssh will ignore SSH_ASKPASS and read from /dev/tty directly.
process->setDisableUnixTerminal(); process->setDisableUnixTerminal();
return hasDisplay;
} }
bool operator==(const SshParameters &p1, const SshParameters &p2) bool operator==(const SshParameters &p1, const SshParameters &p2)

2
src/plugins/projectexplorer/devicesupport/sshparameters.h
View File

@@ -46,7 +46,7 @@ public:
AuthenticationType authenticationType = AuthenticationTypeAll; AuthenticationType authenticationType = AuthenticationTypeAll;
SshHostKeyCheckingMode hostKeyCheckingMode = SshHostKeyCheckingAllowNoMatch; SshHostKeyCheckingMode hostKeyCheckingMode = SshHostKeyCheckingAllowNoMatch;
static bool setupSshEnvironment(Utils::Process *process); static void setupSshEnvironment(Utils::Process *process);
friend PROJECTEXPLORER_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2); friend PROJECTEXPLORER_EXPORT bool operator==(const SshParameters &p1, const SshParameters &p2);
friend bool operator!=(const SshParameters &p1, const SshParameters &p2) { return !(p1 == p2); } friend bool operator!=(const SshParameters &p1, const SshParameters &p2) { return !(p1 == p2); }