You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/02/06 21:32:40 UTC
[2/5] cordova-lib git commit: CB-8239 Fix "platform update" should
ignore `` (close #159)
CB-8239 Fix "platform update" should ignore `<cdv:engine>` (close #159)
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/74b8142c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/74b8142c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/74b8142c
Branch: refs/heads/CB-8416
Commit: 74b8142c281e3cad0bf4c3b8166d97b6637f5a97
Parents: 60f1928
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 3 10:39:06 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Feb 3 10:39:06 2015 -0500
----------------------------------------------------------------------
cordova-lib/src/cordova/platform.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/74b8142c/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index b814fac..7df0e51 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -90,13 +90,11 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) {
version = platform;
platform = null;
}
- if (platform) {
- if (!version) {
- events.emit('verbose', 'No version supplied. Retrieving version from config.xml...');
- }
- version = version || getVersionFromConfigFile(platform, cfg);
+ if (platform && !version && cmd == 'add') {
+ events.emit('verbose', 'No version supplied. Retrieving version from config.xml...');
+ version = getVersionFromConfigFile(platform, cfg);
}
- if (isDirectory(version)) {
+ if (version && isDirectory(version)) {
return getPlatformDetailsFromDir(version, platform);
}
return downloadPlatform(projectRoot, platform, version, opts);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org