spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From van...@apache.org
Subject spark git commit: [SPARK-24263][R] SparkR java check breaks with openjdk
Date Mon, 14 May 2018 17:49:19 GMT
Repository: spark
Updated Branches:
  refs/heads/master b6c50d782 -> 1430fa80e


[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 <felixcheung_m@hotmail.com>

Closes #21314 from felixcheung/openjdkver.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1430fa80
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1430fa80
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1430fa80

Branch: refs/heads/master
Commit: 1430fa80e37762e31cc5adc74cd609c215d84b6e
Parents: b6c50d7
Author: Felix Cheung <felixcheung_m@hotmail.com>
Authored: Mon May 14 10:49:12 2018 -0700
Committer: Marcelo Vanzin <vanzin@cloudera.com>
Committed: Mon May 14 10:49:12 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/1430fa80/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-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message