aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorlinweizhong <linweizhong@huawei.com>2015-05-12 01:36:27 -0700
committerAndrew Or <andrew@databricks.com>2015-05-12 01:36:27 -0700
commit984787526625b4ef8a1635faf7a5ac3cb0b758b7 (patch)
treed5be6fe48f96fff2f6f14360c4e96f42eca67278 /core
parent8a4edecc483490da4fce406ac3b401860834ac1e (diff)
downloadspark-984787526625b4ef8a1635faf7a5ac3cb0b758b7.tar.gz
spark-984787526625b4ef8a1635faf7a5ac3cb0b758b7.tar.bz2
spark-984787526625b4ef8a1635faf7a5ac3cb0b758b7.zip
[MINOR] [PYSPARK] Set PYTHONPATH to python/lib/pyspark.zip rather than python/pyspark
As PR #5580 we have created pyspark.zip on building and set PYTHONPATH to python/lib/pyspark.zip, so to keep consistence update this. Author: linweizhong <linweizhong@huawei.com> Closes #6047 from Sephiroth-Lin/pyspark_pythonpath and squashes the following commits: 8cc3d96 [linweizhong] Set PYTHONPATH to python/lib/pyspark.zip rather than python/pyspark as PR#5580 we have create pyspark.zip on build
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
index acbaba6791..9eff0a230c 100644
--- a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
+++ b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala
@@ -31,7 +31,7 @@ private[spark] object PythonUtils {
def sparkPythonPath: String = {
val pythonPath = new ArrayBuffer[String]
for (sparkHome <- sys.env.get("SPARK_HOME")) {
- pythonPath += Seq(sparkHome, "python").mkString(File.separator)
+ pythonPath += Seq(sparkHome, "python", "lib", "pyspark.zip").mkString(File.separator)
pythonPath += Seq(sparkHome, "python", "lib", "py4j-0.8.2.1-src.zip").mkString(File.separator)
}
pythonPath ++= SparkContext.jarOfObject(this)