You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/09/23 16:38:40 UTC
spark git commit: [SPARK-9710] [TEST] Fix RPackageUtilsSuite when R
is not available.
Repository: spark
Updated Branches:
refs/heads/branch-1.5 4174b94f0 -> 6c6cadb8f
[SPARK-9710] [TEST] Fix RPackageUtilsSuite when R is not available.
RUtils.isRInstalled throws an exception if R is not installed,
instead of returning false. Fix that.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #8008 from vanzin/SPARK-9710 and squashes the following commits:
df72d8c [Marcelo Vanzin] [SPARK-9710] [test] Fix RPackageUtilsSuite when R is not available.
(cherry picked from commit 0f3366a4c740147a7a7519922642912e2dd238f8)
Signed-off-by: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6c6cadb8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6c6cadb8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6c6cadb8
Branch: refs/heads/branch-1.5
Commit: 6c6cadb8febbf65e8540ffa832a317a37a4a8168
Parents: 4174b94
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Mon Aug 10 10:10:40 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Wed Sep 23 07:38:31 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/api/r/RUtils.scala | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6c6cadb8/core/src/main/scala/org/apache/spark/api/r/RUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala
index daad5b5..646fd0b 100644
--- a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala
+++ b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala
@@ -67,7 +67,11 @@ private[spark] object RUtils {
/** Check if R is installed before running tests that use R commands. */
def isRInstalled: Boolean = {
- val builder = new ProcessBuilder(Seq("R", "--version"))
- builder.start().waitFor() == 0
+ try {
+ val builder = new ProcessBuilder(Seq("R", "--version"))
+ builder.start().waitFor() == 0
+ } catch {
+ case e: Exception => false
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org