From 887a77f33bca2cf54b63abdf88911700027a03e6 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Fri, 7 Aug 2015 06:28:53 +1000 Subject: [PATCH 1/2] fixes #11552 --- src/extensibility/node/ExtensionManagerDomain.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/extensibility/node/ExtensionManagerDomain.js b/src/extensibility/node/ExtensionManagerDomain.js index 70d310bbc7a..b86521e78e4 100644 --- a/src/extensibility/node/ExtensionManagerDomain.js +++ b/src/extensibility/node/ExtensionManagerDomain.js @@ -207,7 +207,7 @@ function legacyPackageCheck(legacyDirectory) { * @param {function} callback (err, result) * @param {boolean} _doUpdate private argument to signal that an update should be performed */ -function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUpdate) { +function _cmdInstall(packagePath, destinationDirectory, options, callback, pCallback, _doUpdate) { if (!options || !options.disabledDirectory || !options.apiVersion || !options.systemExtensionDirectory) { callback(new Error(Errors.MISSING_REQUIRED_OPTIONS), null); return; @@ -272,7 +272,7 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUp // If the extension is already there, we signal to the front end that it's already installed // unless the front end has signaled an intent to update. if (hasLegacyPackage || fs.existsSync(installDirectory) || fs.existsSync(systemInstallDirectory)) { - if (_doUpdate) { + if (_doUpdate === true) { if (hasLegacyPackage) { // When there's a legacy installed extension, remove it first, // then also remove any new-style directory the user may have. @@ -334,8 +334,8 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUp * systemExtensionDirectory: !string}} additional settings to control the installation * @param {function} callback (err, result) */ -function _cmdUpdate(packagePath, destinationDirectory, options, callback) { - _cmdInstall(packagePath, destinationDirectory, options, callback, true); +function _cmdUpdate(packagePath, destinationDirectory, options, callback, pCallback) { + _cmdInstall(packagePath, destinationDirectory, options, callback, pCallback, true); } /** @@ -375,7 +375,7 @@ function _endDownload(downloadId, error) { /** * Implements "downloadFile" command, asynchronously. */ -function _cmdDownloadFile(downloadId, url, proxy, callback) { +function _cmdDownloadFile(downloadId, url, proxy, callback, pCallback) { // Backwards compatibility check, added in 0.37 if (typeof proxy === "function") { callback = proxy; @@ -436,7 +436,7 @@ function _cmdAbortDownload(downloadId) { /** * Implements the remove extension command. */ -function _cmdRemove(extensionDir, callback) { +function _cmdRemove(extensionDir, callback, pCallback) { fs.remove(extensionDir, function (err) { if (err) { callback(err); From 6afab584ad7285b6fda939df35e511c46057f4e9 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Fri, 7 Aug 2015 15:42:13 +1000 Subject: [PATCH 2/2] add pCallback param to docs --- src/extensibility/node/ExtensionManagerDomain.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/extensibility/node/ExtensionManagerDomain.js b/src/extensibility/node/ExtensionManagerDomain.js index b86521e78e4..c8e64167be0 100644 --- a/src/extensibility/node/ExtensionManagerDomain.js +++ b/src/extensibility/node/ExtensionManagerDomain.js @@ -205,6 +205,7 @@ function legacyPackageCheck(legacyDirectory) { * @param {{disabledDirectory: !string, apiVersion: !string, nameHint: ?string, * systemExtensionDirectory: !string}} additional settings to control the installation * @param {function} callback (err, result) + * @param {function} pCallback (msg) callback for notifications about operation progress * @param {boolean} _doUpdate private argument to signal that an update should be performed */ function _cmdInstall(packagePath, destinationDirectory, options, callback, pCallback, _doUpdate) { @@ -333,6 +334,7 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, pCall * @param {{disabledDirectory: !string, apiVersion: !string, nameHint: ?string, * systemExtensionDirectory: !string}} additional settings to control the installation * @param {function} callback (err, result) + * @param {function} pCallback (msg) callback for notifications about operation progress */ function _cmdUpdate(packagePath, destinationDirectory, options, callback, pCallback) { _cmdInstall(packagePath, destinationDirectory, options, callback, pCallback, true);