Repository: spark Updated Branches: refs/heads/branch-2.3 867d948a6 -> 88003f02c
[SPARK-24263][R] SparkR java check breaks with openjdk ## What changes were proposed in this pull request? Change text to grep for. ## How was this patch tested? manual test Author: Felix Cheung <felixcheun...@hotmail.com> Closes #21314 from felixcheung/openjdkver. (cherry picked from commit 1430fa80e37762e31cc5adc74cd609c215d84b6e) Signed-off-by: Marcelo Vanzin <van...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/88003f02 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/88003f02 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/88003f02 Branch: refs/heads/branch-2.3 Commit: 88003f02c11bec9df42d225841b82dc748828940 Parents: 867d948 Author: Felix Cheung <felixcheun...@hotmail.com> Authored: Mon May 14 10:49:12 2018 -0700 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Mon May 14 10:49:24 2018 -0700 ---------------------------------------------------------------------- R/pkg/R/client.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/88003f02/R/pkg/R/client.R ---------------------------------------------------------------------- diff --git a/R/pkg/R/client.R b/R/pkg/R/client.R index e9295e0..14a17c6 100644 --- a/R/pkg/R/client.R +++ b/R/pkg/R/client.R @@ -82,7 +82,7 @@ checkJavaVersion <- function() { }) javaVersionFilter <- Filter( function(x) { - grepl("java version", x) + grepl(" version", x) }, javaVersionOut) javaVersionStr <- strsplit(javaVersionFilter[[1]], "[\"]")[[1L]][2] --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
