From c392a9efabcb1ec2a2c53f001ecdae33c245ba35 Mon Sep 17 00:00:00 2001
From: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Date: Thu, 25 Jun 2015 10:56:00 -0700
Subject: [PATCH] [SPARK-8637] [SPARKR] [HOTFIX] Fix packages argument,
sparkSubmitBinName
cc cafreeman
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #7022 from shivaram/sparkr-init-hotfix and squashes the following commits:
9178d15 [Shivaram Venkataraman] Fix packages argument, sparkSubmitBinName
---
R/pkg/R/client.R | 2 +-
R/pkg/R/sparkR.R | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/R/pkg/R/client.R b/R/pkg/R/client.R
index cf2e5ddeb7..78c7a3037f 100644
--- a/R/pkg/R/client.R
+++ b/R/pkg/R/client.R
@@ -57,7 +57,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack
}
launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
- sparkSubmitBin <- determineSparkSubmitBin()
+ sparkSubmitBinName <- determineSparkSubmitBin()
if (sparkHome != "") {
sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName)
} else {
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index 8f81d5640c..633b869f91 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -132,7 +132,7 @@ sparkR.init <- function(
sparkHome = sparkHome,
jars = jars,
sparkSubmitOpts = Sys.getenv("SPARKR_SUBMIT_ARGS", "sparkr-shell"),
- sparkPackages = sparkPackages)
+ packages = sparkPackages)
# wait atmost 100 seconds for JVM to launch
wait <- 0.1
for (i in 1:25) {
--
GitLab