spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: [SPARK-4831] Do not include SPARK_CLASSPATH if empty
Date Sat, 20 Dec 2014 03:32:57 GMT
Repository: spark
Updated Branches:
  refs/heads/master 1d648123a -> 7cb3f5479


[SPARK-4831] Do not include SPARK_CLASSPATH if empty

My guess for fixing https://issues.apache.org/jira/browse/SPARK-4831.

Author: Daniel Darabos <darabos.daniel@gmail.com>

Closes #3678 from darabos/patch-1 and squashes the following commits:

36e1243 [Daniel Darabos] Do not include SPARK_CLASSPATH if empty.


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

Branch: refs/heads/master
Commit: 7cb3f54793124c527d62906c565aba2c3544e422
Parents: 1d64812
Author: Daniel Darabos <darabos.daniel@gmail.com>
Authored: Fri Dec 19 19:32:39 2014 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Fri Dec 19 19:32:46 2014 -0800

----------------------------------------------------------------------
 bin/compute-classpath.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7cb3f547/bin/compute-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 685051e..a31ea73 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -25,7 +25,11 @@ FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
 
 . "$FWDIR"/bin/load-spark-env.sh
 
-CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH"
+if [ -n "$SPARK_CLASSPATH" ]; then
+  CLASSPATH="$SPARK_CLASSPATH:$SPARK_SUBMIT_CLASSPATH"
+else
+  CLASSPATH="$SPARK_SUBMIT_CLASSPATH"
+fi
 
 # Build up classpath
 if [ -n "$SPARK_CONF_DIR" ]; then


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


Mime
View raw message