You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/09/07 05:40:21 UTC
ios commit: CB-11811 - CocoaPods error in cordova-lib tests
Repository: cordova-ios
Updated Branches:
refs/heads/master ad0968667 -> 4975a1fd9
CB-11811 - CocoaPods error in cordova-lib tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/4975a1fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/4975a1fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/4975a1fd
Branch: refs/heads/master
Commit: 4975a1fd95ff6fa62cfeaa486362d607b4b30dec
Parents: ad09686
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Sep 6 22:40:19 2016 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Sep 6 22:40:19 2016 -0700
----------------------------------------------------------------------
bin/templates/scripts/cordova/Api.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4975a1fd/bin/templates/scripts/cordova/Api.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/Api.js b/bin/templates/scripts/cordova/Api.js
index dd2185e..8ddbfaf 100644
--- a/bin/templates/scripts/cordova/Api.js
+++ b/bin/templates/scripts/cordova/Api.js
@@ -252,11 +252,10 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
var val = podsjsonFile.get(podJson.name);
if (val) { // found
if (podJson.spec !== val.spec) { // exists, different spec, print warning
- events.emit('warn', plugin.id + ' depends on ' + podJson.name + '@' + podJson.spec + ', which conflicts with another plugin. ' + podJson.name + '@' + val.spec + ' is already installed and was not overwritten.'); // no point in doing anything else with this plugin
- return;
- } else { // exists, same spec, increment count
- podsjsonFile.increment(podJson.name);
+ events.emit('warn', plugin.id + ' depends on ' + podJson.name + '@' + podJson.spec + ', which conflicts with another plugin. ' + podJson.name + '@' + val.spec + ' is already installed and was not overwritten.');
}
+ // increment count, but don't add in Podfile because it already exists
+ podsjsonFile.increment(podJson.name);
} else { // not found, write new
podJson.count = 1;
podsjsonFile.setJson(podJson.name, podJson);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org