Merge pull request #211 from appcelerator/timob-18783_4_0_X

[TIMOB-18783] Capped SDK version monkey patch for which --password is co...
tidev · Apr 7, 2015 · ab4418a · ab4418a
2 parents e140b61 + 9ff97c1
commit ab4418a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
-4.0.0
+4.0.0 (Unreleased)
 -------------------
- * Ripped out all authentication requirements. Analytics are now anonymous. Login and logout are no ops. [TIMOB-18711]
  * Added support for generic Titanium SDK-level info [TIMOB-17836]
  * Allow the colors to be controlled explicitly regardless if attached or detached from a TTY
  * Fixed bug where abbreviated options without values passed in before the last argument being treated as a boolean [TIMOB-18067]
+ * Ripped out all authentication requirements. Analytics are now anonymous. Login and logout are no ops. [TIMOB-18711]
+ * Capped SDK version monkey patch for which --password is converted to --store-password for Android [TIMOB-18783]
 
-3.4.2
+3.4.2 (3/6/2015)
 -------------------
  * Fixed compatibility issues with Node 0.12 [TIMOB-18538]
  * Added Node.js version check when using a Titanium SDK [TIMOB-18629]

diff --git a/hooks/tisdk3fixes.js b/hooks/tisdk3fixes.js
@@ -45,7 +45,7 @@ exports.init = function (logger, config, cli, appc) {
 		// there was a bug in 3.2.0 where the --store-password was being forced to
 		// --password when forking the correct SDK command with a SDK >= 3.2.0, so we
 		// need to reverse it
-		if (sdk && appc.version.gte(sdk, '3.2.0') && cli.argv.platform == 'android' && !cli.argv['store-password'] && cli.argv.password) {
+		if (sdk && appc.version.gte(sdk, '3.2.0') && appc.version.lt(sdk, '4.0.0') && cli.argv.platform === 'android' && !cli.argv['store-password'] && cli.argv.password) {
 			cli.argv['store-password'] = cli.argv.password;
 		}
 	});