From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Wed, 11 May 2016 11:48:01 +0000 (+0300)
Subject: Merge pull request #386 fix conflict
X-Git-Tag: idea/162.115~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=a25d3ff9bb5145dc009b53eaa9b12eb6012b638f

Merge pull request #386 fix conflict
---

a25d3ff9bb5145dc009b53eaa9b12eb6012b638f
diff --cc python/src/com/jetbrains/python/debugger/PyDebugRunner.java
index 9792c06af3a5,69322272a415..24c225e838a4
--- a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java
@@@ -357,14 -362,11 +363,14 @@@ public class PyDebugRunner extends Gene
        final RunConfiguration configuration = selectedConfiguration.getConfiguration();
        if (configuration instanceof AbstractPythonRunConfiguration) {
          AbstractPythonRunConfiguration runConfiguration = (AbstractPythonRunConfiguration)configuration;
 -        List<String> roots = Lists.newArrayList();
 -        for (VirtualFile contentRoot : runConfiguration.getSdk().getSdkModificator().getRoots(OrderRootType.CLASSES)) {
 -          roots.add(contentRoot.getPath());
 +        final Sdk sdk = runConfiguration.getSdk();
 +        if (sdk != null) {
 +          List<String> roots = Lists.newArrayList();
 +          for (VirtualFile contentRoot : sdk.getSdkModificator().getRoots(OrderRootType.CLASSES)) {
 +            roots.add(contentRoot.getPath());
 +          }
-           commandLine.getEnvironment().put(LIBRARY_ROOTS, StringUtil.join(roots, File.pathSeparator));
++          environment.put(LIBRARY_ROOTS, StringUtil.join(roots, File.pathSeparator));
          }
 -        environment.put(LIBRARY_ROOTS, StringUtil.join(roots, File.pathSeparator));
        }
      }
    }