From 1956fa03659bb4cd225cb66c712c0319615d0685 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 15 Jun 2022 13:10:26 +0200 Subject: Python: prevent setting local env to remote pyls Change-Id: Id0eea5420c897687e6931bf640e3a37ba2638b8f Reviewed-by: Christian Stenger --- src/plugins/python/pythonlanguageclient.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/plugins/python/pythonlanguageclient.cpp') diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp index 2a4ea8c7d9..e621cd6283 100644 --- a/src/plugins/python/pythonlanguageclient.cpp +++ b/src/plugins/python/pythonlanguageclient.cpp @@ -153,14 +153,22 @@ class PyLSInterface : public StdIOClientInterface public: PyLSInterface() : m_extraPythonPath("QtCreator-pyls-XXXXXX") + { } + + TemporaryDirectory m_extraPythonPath; +protected: + void startImpl() override { - Environment env = Environment::systemEnvironment(); - env.appendOrSet("PYTHONPATH", - m_extraPythonPath.path().toString(), - OsSpecificAspects::pathListSeparator(env.osType())); - setEnvironment(env); + if (!m_cmd.executable().needsDevice()) { + // todo check where to put this tempdir in remote setups + Environment env = Environment::systemEnvironment(); + env.appendOrSet("PYTHONPATH", + m_extraPythonPath.path().toString(), + OsSpecificAspects::pathListSeparator(env.osType())); + setEnvironment(env); + } + StdIOClientInterface::startImpl(); } - TemporaryDirectory m_extraPythonPath; }; PyLSClient *clientForPython(const FilePath &python) -- cgit v1.2.1