aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pentreath <nick.pentreath@gmail.com>2013-12-12 13:08:59 +0200
committerNick Pentreath <nick.pentreath@gmail.com>2013-12-12 13:08:59 +0200
commit8cdfb08c47131ce3438e5faf1222af2039424324 (patch)
tree37076e57477a52378e6aa899e50fa858f584610e
parentd2efe13574090e93c600adeacc7f6356bc196e6c (diff)
downloadspark-8cdfb08c47131ce3438e5faf1222af2039424324.tar.gz
spark-8cdfb08c47131ce3438e5faf1222af2039424324.tar.bz2
spark-8cdfb08c47131ce3438e5faf1222af2039424324.zip
Fix 'IPYTHON=1 ./pyspark' throwing 'ValueError: Cannot run multiple SparkContexts at once'
-rwxr-xr-xpyspark3
1 files changed, 1 insertions, 2 deletions
diff --git a/pyspark b/pyspark
index 4941a36d0d..18f668ec97 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