Skip to content

Ignore directories with the same name as python binaries #15367

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
Karthik Nadig (karthiknadig) merged 2 commits into from
Feb 9, 2021
Merged

Ignore directories with the same name as python binaries #15367

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972649f
Ignore directories with the same name as pyhton binaries
karthiknadig Feb 9, 2021
9fcae82
Use withFileTypes instead of lstat
karthiknadig Feb 9, 2021
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
Prev Previous commit
Use withFileTypes instead of lstat
  • Loading branch information
@karthiknadig
karthiknadig committed Feb 9, 2021
commit 9fcae82872720826807029f29e5208a1d0e6e79b
31 changes: 14 additions & 17 deletions src/client/pythonEnvironments/discovery/locators/services/posixKnownPathsLocator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import * as fsapi from 'fs-extra';
import * as fs from 'fs';
import * as path from 'path';
import { traceError, traceInfo } from '../../../../common/logger';

Expand All @@ -14,26 +14,23 @@ import { getFileInfo, resolveSymbolicLink } from '../../../common/externalDepend
import { commonPosixBinPaths, isPosixPythonBinPattern } from '../../../common/posixUtils';

async function getPythonBinFromKnownPaths(): Promise<string[]> {
const knownPaths = await commonPosixBinPaths();
const knownDirs = await commonPosixBinPaths();
const pythonBins: Set<string> = new Set();
for (const knownPath of knownPaths) {
const paths = (await fsapi.readdir(knownPath))
.map((filename: string) => path.join(knownPath, filename))
for (const dirname of knownDirs) {
const paths = (await fs.promises.readdir(dirname, { withFileTypes: true }))
.filter((dirent: fs.Dirent) => !dirent.isDirectory())
.map((dirent: fs.Dirent) => path.join(dirname, dirent.name))
.filter(isPosixPythonBinPattern);

for (const filepath of paths) {
// Skip any directories
const stats = await fsapi.lstat(filepath);
if (!stats.isDirectory()) {
// Ensure that we have a collection of unique global binaries by
// resolving all symlinks to the target binaries.
try {
const resolvedBin = await resolveSymbolicLink(filepath);
pythonBins.add(resolvedBin);
traceInfo(`Found: ${filepath} --> ${resolvedBin}`);
} catch (ex) {
traceError('Failed to resolve symbolic link: ', ex);
}
// Ensure that we have a collection of unique global binaries by
// resolving all symlinks to the target binaries.
try {
const resolvedBin = await resolveSymbolicLink(filepath);
pythonBins.add(resolvedBin);
traceInfo(`Found: ${filepath} --> ${resolvedBin}`);
} catch (ex) {
traceError('Failed to resolve symbolic link: ', ex);
}
}
}
Expand Down