From 847ae9e657e3e5b95f0d09d26c9052e5ca6a201e Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Sep 2013 16:01:37 +0200 Subject: [PATCH] another place where we need to check for empty extraSysPath --- .../python/sdk/skeletons/PySkeletonGenerator.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/python/src/com/jetbrains/python/sdk/skeletons/PySkeletonGenerator.java b/python/src/com/jetbrains/python/sdk/skeletons/PySkeletonGenerator.java index 0d66b64ce259..6c3281a201f6 100644 --- a/python/src/com/jetbrains/python/sdk/skeletons/PySkeletonGenerator.java +++ b/python/src/com/jetbrains/python/sdk/skeletons/PySkeletonGenerator.java @@ -17,10 +17,7 @@ import com.jetbrains.python.sdk.PythonSdkType; import org.jetbrains.annotations.NotNull; import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.jetbrains.python.sdk.skeletons.SkeletonVersionChecker.fromVersionString; @@ -169,10 +166,14 @@ public class PySkeletonGenerator { if (homePath == null) throw new InvalidSdkException("Broken home path for " + sdk.getName()); final String parentDir = new File(homePath).getParent(); - final String[] cmd = new String[]{homePath, PythonHelpersLocator.getHelperPath(GENERATOR3), "-v", "-L", "-s", extraSysPath}; + List cmd = new ArrayList(Arrays.asList(homePath, PythonHelpersLocator.getHelperPath(GENERATOR3), "-v", "-L")); + if (!StringUtil.isEmpty(extraSysPath)) { + cmd.add("-s"); + cmd.add(extraSysPath); + } final ProcessOutput process = getProcessOutput(parentDir, - cmd, + ArrayUtil.toStringArray(cmd), PythonSdkType.getVirtualEnvAdditionalEnv(homePath), MINUTE * 4); // see PY-3898