From c3de8c7f318c90234bd109ec8cc6ab618eab5d52 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 24 Jun 2024 09:17:32 +0200 Subject: [PATCH] SshParameters: Remove return value from setupSshEnvironment() Change-Id: I3e58454f23b5828991a5da1a88913f68d0f3ac9b Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/devicesupport/sshparameters.cpp | 4 +--- src/plugins/projectexplorer/devicesupport/sshparameters.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp index 2b2ebdabc00..c266055003c 100644 --- a/src/plugins/projectexplorer/devicesupport/sshparameters.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshparameters.cpp @@ -75,12 +75,11 @@ QStringList SshParameters::connectionOptions(const FilePath &binary) const return args; } -bool SshParameters::setupSshEnvironment(Process *process) +void SshParameters::setupSshEnvironment(Process *process) { Environment env = process->controlEnvironment(); if (!env.hasChanges()) env = Environment::systemEnvironment(); - const bool hasDisplay = env.hasKey("DISPLAY") && (env.value("DISPLAY") != QString(":0")); if (SshSettings::askpassFilePath().exists()) { env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput()); 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. process->setDisableUnixTerminal(); - return hasDisplay; } bool operator==(const SshParameters &p1, const SshParameters &p2) diff --git a/src/plugins/projectexplorer/devicesupport/sshparameters.h b/src/plugins/projectexplorer/devicesupport/sshparameters.h index 5a5f32da268..da57f2c5aa2 100644 --- a/src/plugins/projectexplorer/devicesupport/sshparameters.h +++ b/src/plugins/projectexplorer/devicesupport/sshparameters.h @@ -46,7 +46,7 @@ public: AuthenticationType authenticationType = AuthenticationTypeAll; 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 bool operator!=(const SshParameters &p1, const SshParameters &p2) { return !(p1 == p2); }