Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
If interpreter is provided use that to check if is conda environment
  • Loading branch information
DonJayamanne committed Feb 6, 2020
commit 519e2e8f5ea8c6b661f45057e7528368ac843200
2 changes: 1 addition & 1 deletion src/client/common/terminal/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class TerminalHelper implements ITerminalHelper {
}

// If we have a conda environment, then use that.
const isCondaEnvironment = await this.condaService.isCondaEnvironment(settings.pythonPath);
const isCondaEnvironment = interpreter ? interpreter.type === InterpreterType.Conda : await this.condaService.isCondaEnvironment(settings.pythonPath);
if (isCondaEnvironment) {
const activationCommands = interpreter
? await this.conda.getActivationCommandsForInterpreter(interpreter.path, terminalShellType)
Expand Down