Updated Branches: refs/heads/master c55e69855 -> d2ced6d58
Fix 'IPYTHON=1 ./pyspark' throwing 'ValueError: Cannot run multiple SparkContexts at once' Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/8cdfb08c Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/8cdfb08c Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/8cdfb08c Branch: refs/heads/master Commit: 8cdfb08c47131ce3438e5faf1222af2039424324 Parents: d2efe13 Author: Nick Pentreath <[email protected]> Authored: Thu Dec 12 13:08:59 2013 +0200 Committer: Nick Pentreath <[email protected]> Committed: Thu Dec 12 13:08:59 2013 +0200 ---------------------------------------------------------------------- pyspark | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/8cdfb08c/pyspark ---------------------------------------------------------------------- diff --git a/pyspark b/pyspark index 4941a36..18f668e 100755 --- a/pyspark +++ b/pyspark @@ -59,8 +59,7 @@ if [ -n "$IPYTHON_OPTS" ]; then fi if [[ "$IPYTHON" = "1" ]] ; then - IPYTHON_OPTS=${IPYTHON_OPTS:--i} - exec ipython "$IPYTHON_OPTS" -c "%run $PYTHONSTARTUP" + exec ipython "$IPYTHON_OPTS" "$@" else exec "$PYSPARK_PYTHON" "$@" fi
