Skip to content

Do not force translate to using conda.bat file if user has explicitly stated to use conda.exe #18776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Do not force translate to using conda.bat file if user has explicitly stated to use conda.exe #18776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/client/pythonEnvironments/common/environmentManagers/conda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ export class Conda {
private static async locate(): Promise<Conda | undefined> {
traceVerbose(`Searching for conda.`);
const home = getUserHomeDir();
const customCondaPath = getPythonSetting<string>(CONDAPATH_SETTING_KEY);
const suffix = getOSType() === OSType.Windows ? 'Scripts\\conda.exe' : 'bin/conda';

// Produce a list of candidate binaries to be probed by exec'ing them.
async function* getCandidates() {
const customCondaPath = getPythonSetting<string>(CONDAPATH_SETTING_KEY);
if (customCondaPath && customCondaPath !== 'conda') {
// If user has specified a custom conda path, use it first.
yield customCondaPath;
Expand Down Expand Up @@ -369,8 +369,9 @@ export class Conda {
let conda = new Conda(condaPath);
try {
await conda.getInfo();
if (getOSType() === OSType.Windows) {
if (getOSType() === OSType.Windows && (isTestExecution() || condaPath !== customCondaPath)) {
// Prefer to use .bat files over .exe on windows as that is what cmd works best on.
// Do not translate to `.bat` file if the setting explicitly sets the executable.
const condaBatFile = await getCondaBatFile(condaPath);
try {
if (condaBatFile) {
Expand Down