From 72dbf4f682e0307d266690889b94faa83935a92d Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Mon, 29 Sep 2014 16:50:27 +0400
Subject: [PATCH] Don't substitute ExecutionExeption with PyExecutionException

---
 .../packaging/PyPackageManagerImpl.java       |  9 ------
 .../packaging/PyRemotePackageManagerImpl.java | 31 ++++++++-----------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
index f74b1cceaa1c..95624c3d44be 100644
--- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
@@ -502,15 +502,6 @@ public class PyPackageManagerImpl extends PyPackageManager {
       }
       return result;
     }
-    catch (RunCanceledByUserException e) {
-      throw e;
-    }
-    catch (PyExecutionException e) {
-      throw e;
-    }
-    catch (ExecutionException e) {
-      throw new PyExecutionException(e.getMessage(), helperPath, args, 0);
-    }
     catch (IOException e) {
       throw new PyExecutionException(e.getMessage(), helperPath, args, 0);
     }
diff --git a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java
index b5bb22c5c588..22981e53b9ec 100644
--- a/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java
+++ b/python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java
@@ -108,26 +108,21 @@ public class PyRemotePackageManagerImpl extends PyPackageManagerImpl {
             return quoteIfNeeded(input);
           }
         }));
-        try {
-          if (askForSudo) {
-            askForSudo = !manager.ensureCanWrite(null, remoteSdkCredentials, remoteSdkCredentials.getInterpreterPath());
-          }
-          ProcessOutput processOutput;
-          do {
-            PathMappingSettings mappings = manager.setupMappings(null, (PyRemoteSdkAdditionalDataBase)sdkData, null);
-            processOutput =
-              manager.runRemoteProcess(null, remoteSdkCredentials, mappings, ArrayUtil.toStringArray(cmdline), workingDir, askForSudo);
-            if (askForSudo && processOutput.getStderr().contains("sudo: 3 incorrect password attempts")) {
-              continue;
-            }
-            break;
-          }
-          while (true);
-          return processOutput;
+        if (askForSudo) {
+          askForSudo = !manager.ensureCanWrite(null, remoteSdkCredentials, remoteSdkCredentials.getInterpreterPath());
         }
-        catch (ExecutionException e) {
-          throw new PyExecutionException("Error running SDK: " + e.getMessage(), helperPath, args, 0);
+        ProcessOutput processOutput;
+        do {
+          PathMappingSettings mappings = manager.setupMappings(null, (PyRemoteSdkAdditionalDataBase)sdkData, null);
+          processOutput =
+            manager.runRemoteProcess(null, remoteSdkCredentials, mappings, ArrayUtil.toStringArray(cmdline), workingDir, askForSudo);
+          if (askForSudo && processOutput.getStderr().contains("sudo: 3 incorrect password attempts")) {
+            continue;
+          }
+          break;
         }
+        while (true);
+        return processOutput;
       }
       else {
         throw new PyExecutionException(PythonRemoteInterpreterManager.WEB_DEPLOYMENT_PLUGIN_IS_DISABLED, helperPath, args, 0);