Do not cache result if running an interpreter fails (#20178)

Kartik Raj · web-flow · commit 08417adf5f01 · 2022-11-08T02:24:56.000-08:00
For microsoft#20147
diff --git a/src/client/common/variables/environmentVariablesProvider.ts b/src/client/common/variables/environmentVariablesProvider.ts
@@ -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';
@@ -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;
     }
 
diff --git a/src/client/pythonEnvironments/base/info/environmentInfoService.ts b/src/client/pythonEnvironments/base/info/environmentInfoService.ts
@@ -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);
diff --git a/src/client/pythonEnvironments/common/environmentManagers/conda.ts b/src/client/pythonEnvironments/common/environmentManagers/conda.ts
@@ -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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ export class Conda {`
`435`	`435`	`// eslint-disable-next-line class-methods-use-this`
`436`	`436`	`private async getInfoImpl(command: string): Promise<CondaInfo> {`
`437`	`437`	`const result = await exec(command, ['info', '--json'], { timeout: CONDA_GENERAL_TIMEOUT });`
`438`		- traceVerbose(`conda info --json: ${result.stdout}`);
	`438`	+ traceVerbose(`${command} info --json: ${result.stdout}`);
`439`	`439`	`return JSON.parse(result.stdout);`
`440`	`440`	`}`
`441`	`441`