From 916015a09363fe6bb8ede201423f457e21b58579 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Thu, 5 Oct 2017 12:31:06 +0300 Subject: [PATCH] Always null projectOrComponent parameter of ensureCanWrite() removed `ConnectionOwnerFactory` from ssh module is used instead of deprecated one in remote-run. --- .../jetbrains/python/packaging/PyRemotePackageManagerImpl.java | 2 +- .../jetbrains/python/remote/PythonRemoteInterpreterManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java index d06d74c92dca..8c6a1bfe2461 100644 --- a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java @@ -115,7 +115,7 @@ public class PyRemotePackageManagerImpl extends PyPackageManagerImpl { } if (manager != null && remoteSdkCredentials != null) { if (askForSudo) { - askForSudo = !manager.ensureCanWrite(null, remoteSdkCredentials, remoteSdkCredentials.getInterpreterPath()); + askForSudo = !manager.ensureCanWrite(remoteSdkCredentials, remoteSdkCredentials.getInterpreterPath()); } } else { diff --git a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java index 582e33b41a71..f3b2699b49bc 100644 --- a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java +++ b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java @@ -85,7 +85,7 @@ public abstract class PythonRemoteInterpreterManager { @NotNull Sdk sdk, String path) throws ExecutionException; - public abstract boolean ensureCanWrite(@Nullable Object projectOrComponent, RemoteSdkCredentials data, String path); + public abstract boolean ensureCanWrite(RemoteSdkCredentials data, String path); /** * @param sdk current sdk