cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an-s...@apache.org
Subject android commit: CB-9430 Fixes check_reqs failure when javac returns an extra line
Date Fri, 31 Jul 2015 13:53:38 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 64f89c5ed -> e5506d40b


CB-9430 Fixes check_reqs failure when javac returns an extra line


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e5506d40
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e5506d40
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e5506d40

Branch: refs/heads/master
Commit: e5506d40bc444b468fbb04e4b9c3c9df6f3a0dec
Parents: 64f89c5
Author: Vladimir Kotikov <v-vlkoti@microsoft.com>
Authored: Fri Jul 31 16:37:21 2015 +0300
Committer: Vladimir Kotikov <v-vlkoti@microsoft.com>
Committed: Fri Jul 31 16:37:21 2015 +0300

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e5506d40/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index ffa35b6..9d25159 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -155,7 +155,8 @@ module.exports.check_java = function() {
             // javac writes version info to stderr instead of stdout
             return tryCommand('javac -version', msg, true);
         }).then(function (output) {
-            return /^javac ((?:\d+\.)+(?:\d+))/i.exec(output)[1];
+            var match = /javac ((?:\d+\.)+(?:\d+))/i.exec(output)[1];
+            return match && match[1];
         });
     });
 };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message