Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B11CE18764 for ; Sat, 19 Mar 2016 00:56:49 +0000 (UTC) Received: (qmail 18841 invoked by uid 500); 19 Mar 2016 00:56:48 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 18779 invoked by uid 500); 19 Mar 2016 00:56:48 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 18318 invoked by uid 99); 19 Mar 2016 00:56:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Mar 2016 00:56:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6CE60DFA0A; Sat, 19 Mar 2016 00:56:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Sat, 19 Mar 2016 00:57:07 -0000 Message-Id: In-Reply-To: <68dc461ced264992b52e6c082ffbb9f4@git.apache.org> References: <68dc461ced264992b52e6c082ffbb9f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/37] cordova-lib git commit: CB-10673 add plugin --force option. This closes #404 CB-10673 add plugin --force option. This closes #404 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e1bde1af Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e1bde1af Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e1bde1af Branch: refs/heads/common-1.1.x Commit: e1bde1afa0f22b783d3cecc5f7d14c39ab17528b Parents: 45a235f Author: Byoungro So Authored: Tue Mar 1 23:23:19 2016 -0800 Committer: Nikhil Khandelwal Committed: Mon Mar 7 22:43:42 2016 -0800 ---------------------------------------------------------------------- cordova-lib/src/cordova/platform.js | 1 + cordova-lib/src/cordova/plugin.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e1bde1af/cordova-lib/src/cordova/platform.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 1b745be..9b1157e 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -654,6 +654,7 @@ function installPluginsForNewPlatform(platform, projectRoot, opts) { // specify the option below in both places usePlatformWww: true, is_top_level: pluginMetadata.is_top_level + force: opts.force }; var variables = pluginMetadata && pluginMetadata.variables; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e1bde1af/cordova-lib/src/cordova/plugin.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index c5ead29..a5398a0 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -176,7 +176,8 @@ module.exports = function plugin(command, targets, opts) { // and files from 'platform_www' merged into 'www'. Thus we need to persist these // files platform_www directory, so they'll be applied to www on each prepare. usePlatformWww: true, - nohooks: opts.nohooks + nohooks: opts.nohooks, + force: opts.force }; events.emit('verbose', 'Calling plugman.install on plugin "' + pluginInfo.dir + '" for platform "' + platform); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org