ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

catch getpythonuserdir error (#14193) (#14263)

Browse Source
This commit is contained in:
Lucy Zhang
2021-02-11 15:29:01 -08:00
committed by GitHub
parent b17ae9a24e
commit 4b87a0869f
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -35,6 +35,7 @@ const msgWaitingForInstall = localize('msgWaitingForInstall', "Another Python in
function msgDependenciesInstallationFailed(errorMessage: string): string { return localize('msgDependenciesInstallationFailed', "Installing Notebook dependencies failed with error: {0}", errorMessage); } function msgDependenciesInstallationFailed(errorMessage: string): string { return localize('msgDependenciesInstallationFailed', "Installing Notebook dependencies failed with error: {0}", errorMessage); }
function msgDownloadPython(platform: string, pythonDownloadUrl: string): string { return localize('msgDownloadPython', "Downloading local python for platform: {0} to {1}", platform, pythonDownloadUrl); } function msgDownloadPython(platform: string, pythonDownloadUrl: string): string { return localize('msgDownloadPython', "Downloading local python for platform: {0} to {1}", platform, pythonDownloadUrl); }
function msgPackageRetrievalFailed(errorMessage: string): string { return localize('msgPackageRetrievalFailed', "Encountered an error when trying to retrieve list of installed packages: {0}", errorMessage); } function msgPackageRetrievalFailed(errorMessage: string): string { return localize('msgPackageRetrievalFailed', "Encountered an error when trying to retrieve list of installed packages: {0}", errorMessage); }
function msgGetPythonUserDirFailed(errorMessage: string): string { return localize('msgGetPythonUserDirFailed', "Encountered an error when getting Python user path: {0}", errorMessage); }
export interface PythonInstallSettings { export interface PythonInstallSettings {
installPath: string; installPath: string;
@@ -705,24 +706,28 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
} }
private async getPythonUserDir(pythonExecutable: string): Promise<string> { private async getPythonUserDir(pythonExecutable: string): Promise<string> {
let sitePath: string; try {
if (process.platform === constants.winPlatform) { let sitePath: string;
sitePath = 'USER_SITE';
} else {
sitePath = 'USER_BASE';
}
let cmd = `"${pythonExecutable}" -c "import site;print(site.${sitePath})"`;
let packagesDir = await utils.executeBufferedCommand(cmd, {});
if (packagesDir && packagesDir.length > 0) {
packagesDir = packagesDir.trim();
if (process.platform === constants.winPlatform) { if (process.platform === constants.winPlatform) {
packagesDir = path.resolve(path.join(packagesDir, '..', 'Scripts')); sitePath = 'USER_SITE';
} else { } else {
packagesDir = path.join(packagesDir, 'bin'); sitePath = 'USER_BASE';
} }
let cmd = `"${pythonExecutable}" -c "import site;print(site.${sitePath})"`;
return packagesDir; let packagesDir = await utils.executeBufferedCommand(cmd, {});
if (packagesDir && packagesDir.length > 0) {
packagesDir = packagesDir.trim();
if (process.platform === constants.winPlatform) {
packagesDir = path.resolve(path.join(packagesDir, '..', 'Scripts'));
} else {
packagesDir = path.join(packagesDir, 'bin');
}
return packagesDir;
}
} catch (err) {
this.outputChannel.appendLine(msgGetPythonUserDirFailed(utils.getErrorMessage(err)));
} }
return undefined; return undefined;