Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 2 additions & 1 deletion src/client/common/variables/environmentVariablesProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { inject, injectable, optional } from 'inversify';
import path from 'path';
import { ConfigurationChangeEvent, Disposable, Event, EventEmitter, FileSystemWatcher, Uri } from 'vscode';
import { traceError } from '../../logging';
import { traceError, traceVerbose } from '../../logging';
import { sendFileCreationTelemetry } from '../../telemetry/envFileTelemetry';
import { IWorkspaceService } from '../application/types';
import { PythonSettings } from '../configSettings';
Expand Down Expand Up @@ -61,6 +61,7 @@ export class EnvironmentVariablesProvider implements IEnvironmentVariablesProvid
}
const vars = await this._getEnvironmentVariables(resource);
this.setCachedEnvironmentVariables(resource, vars);
traceVerbose('Dump environment variables', JSON.stringify(vars, null, 4));
return vars;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ class EnvironmentInfoService implements IEnvironmentInfoService {
this._getEnvironmentInfo(env, priority)
.then((r) => {
deferred.resolve(r);
if (r === undefined) {
this.cache.delete(normCasePath(interpreterPath));
}
})
.catch((ex) => {
deferred.reject(ex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ export class Conda {
// eslint-disable-next-line class-methods-use-this
private async getInfoImpl(command: string): Promise<CondaInfo> {
const result = await exec(command, ['info', '--json'], { timeout: CONDA_GENERAL_TIMEOUT });
traceVerbose(`conda info --json: ${result.stdout}`);
traceVerbose(`${command} info --json: ${result.stdout}`);
return JSON.parse(result.stdout);
}

Expand Down