Log a warning if couldn't read shell environment

This commit is contained in:
Dmitry Trofimov
2017-11-14 15:04:55 +01:00
parent 9b69694708
commit 62894e202a
@@ -53,18 +53,23 @@ class PyVirtualEnvReader(val virtualEnvSdkPath: String) : EnvironmentUtil.ShellE
}
override fun readShellEnv(): MutableMap<String, String> {
if (SystemInfo.isUnix) {
return super.readShellEnv()
}
else {
if (activate != null) {
return readVirtualEnvOnWindows(activate);
try {
if (SystemInfo.isUnix) {
return super.readShellEnv()
}
else {
LOG.error("Can't find activate script for $virtualEnvSdkPath")
return mutableMapOf();
if (activate != null) {
return readVirtualEnvOnWindows(activate);
}
else {
LOG.error("Can't find activate script for $virtualEnvSdkPath")
}
}
} catch (e: Exception) {
LOG.warn("Couldn't read shell environment: ${e.message}")
}
return mutableMapOf()
}
override fun dumpProcessEnvToFile(command: MutableList<String>, envFile: File, lineSeparator: String?): MutableMap<String, String> {