Skip to content

Commit

Permalink
[SPARK-11880][WINDOWS][SPARK SUBMIT] bin/load-spark-env.cmd loads spa…
Browse files Browse the repository at this point in the history
…rk-env.cmd from wrong directory

* On windows the `bin/load-spark-env.cmd` tries to load `spark-env.cmd` from `%~dp0..\..\conf`, where `~dp0` points to `bin` and `conf` is only one level up.
* Updated `bin/load-spark-env.cmd` to load `spark-env.cmd` from `%~dp0..\conf`, instead of `%~dp0..\..\conf`

Author: wangt <[email protected]>

Closes #9863 from toddwan/master.
  • Loading branch information
wangt authored and Andrew Or committed Nov 25, 2015
1 parent 83653ac commit 9f3e59a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bin/load-spark-env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [%SPARK_ENV_LOADED%] == [] (
if not [%SPARK_CONF_DIR%] == [] (
set user_conf_dir=%SPARK_CONF_DIR%
) else (
set user_conf_dir=%~dp0..\..\conf
set user_conf_dir=%~dp0..\conf
)

call :LoadSparkEnv
Expand Down

0 comments on commit 9f3e59a

Please sign in to comment.