Repository: spark Updated Branches: refs/heads/branch-1.1 82ab4a796 -> 3a7875d9d
[SPARK-3808] PySpark fails to start in Windows Modified syntax error of *.cmd script. Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Closes #2669 from tsudukim/feature/SPARK-3808 and squashes the following commits: 7f804e6 [Masayoshi TSUZUKI] [SPARK-3808] PySpark fails to start in Windows (cherry picked from commit 12e2551ea1773ae19559ecdada35d23608e6b0ec) Signed-off-by: Andrew Or <andrewo...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3a7875d9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3a7875d9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3a7875d9 Branch: refs/heads/branch-1.1 Commit: 3a7875d9d61ae8adb75362d0129e72f3d10b5814 Parents: 82ab4a7 Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Authored: Tue Oct 7 11:53:22 2014 -0700 Committer: Andrew Or <andrewo...@gmail.com> Committed: Tue Oct 7 11:53:42 2014 -0700 ---------------------------------------------------------------------- bin/compute-classpath.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3a7875d9/bin/compute-classpath.cmd ---------------------------------------------------------------------- diff --git a/bin/compute-classpath.cmd b/bin/compute-classpath.cmd index 9b9e403..3cd0579 100644 --- a/bin/compute-classpath.cmd +++ b/bin/compute-classpath.cmd @@ -38,7 +38,7 @@ if exist "%FWDIR%conf\spark-env.cmd" call "%FWDIR%conf\spark-env.cmd" rem Build up classpath set CLASSPATH=%SPARK_CLASSPATH%;%SPARK_SUBMIT_CLASSPATH% -if "x%SPARK_CONF_DIR%"!="x" ( +if not "x%SPARK_CONF_DIR%"=="x" ( set CLASSPATH=%CLASSPATH%;%SPARK_CONF_DIR% ) else ( set CLASSPATH=%CLASSPATH%;%FWDIR%conf --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
