From 754fd61ab850e708334c5cb218ec8b8b847d4ae6 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Wed, 22 Jul 2020 15:04:49 -0400 Subject: [PATCH] Make context switch listeners even more best-effort (#2182) * Make context switch listeners even more best-effort * Prep 1.4.1 --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- src/docker/ContextManager.ts | 16 ++++++++++------ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9801e1ce52..cb7fcf01b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.1 - 22 July 2020 +### Fixed +* "Permission denied" issue during extension activation. [#2181](https://github.com/microsoft/vscode-docker/issues/2181) + ## 1.4.0 - 22 July 2020 ### Added * Support for Azure Container Instances Docker contexts. [#2102](https://github.com/microsoft/vscode-docker/issues/2102) diff --git a/package-lock.json b/package-lock.json index 2dfa4fe694..923db6a66e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-docker", - "version": "1.4.0", + "version": "1.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2c74d8a4e9..329003646e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vscode-docker", - "version": "1.4.0", + "version": "1.4.1", "publisher": "ms-azuretools", "displayName": "Docker", "description": "Makes it easy to create, manage, and debug containerized applications.", diff --git a/src/docker/ContextManager.ts b/src/docker/ContextManager.ts index d1c8488b69..93a9ffc529 100644 --- a/src/docker/ContextManager.ts +++ b/src/docker/ContextManager.ts @@ -74,13 +74,17 @@ export class DockerContextManager implements ContextManager, Disposable { // The file watchers are not strictly necessary; they serve to help the extension detect context switches // that are done in CLI. Worst case, a user would have to restart VSCode. /* eslint-disable @typescript-eslint/tslint/config */ - if (fse.existsSync(dockerConfigFile)) { - this.configFileWatcher = fs.watch(dockerConfigFile, async () => this.refresh()); - } + try { + if (fse.existsSync(dockerConfigFile)) { + this.configFileWatcher = fs.watch(dockerConfigFile, async () => this.refresh()); + } + } catch { } // Best effort - if (fse.existsSync(dockerContextsFolder)) { - this.contextFolderWatcher = fs.watch(dockerContextsFolder, async () => this.refresh()); - } + try { + if (fse.existsSync(dockerContextsFolder)) { + this.contextFolderWatcher = fs.watch(dockerContextsFolder, async () => this.refresh()); + } + } catch { } // Best effort /* eslint-enable @typescript-eslint/tslint/config */ }