diff options
| author | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
| commit | e2d25d2dfeb1d43d1e36f169250d8efef4ac232a (patch) | |
| tree | d911a37f5aacc89bc3a1c76d41842e1c156aec6a /bin | |
| parent | 8038da232870fe016e73122a2ef110ac8e56ca1e (diff) | |
| parent | b93f9d42f21f03163734ef97b2871db945e166da (diff) | |
| download | spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.gz spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.bz2 spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.zip | |
Merge branch 'master' into graphx
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/pyspark | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bin/pyspark b/bin/pyspark index d6810f4686..ed6f8da730 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -59,12 +59,7 @@ if [ -n "$IPYTHON_OPTS" ]; then fi if [[ "$IPYTHON" = "1" ]] ; then - # IPython <1.0.0 doesn't honor PYTHONSTARTUP, while 1.0.0+ does. - # Hence we clear PYTHONSTARTUP and use the -c "%run $IPYTHONSTARTUP" command which works on all versions - # We also force interactive mode with "-i" - IPYTHONSTARTUP=$PYTHONSTARTUP - PYTHONSTARTUP= - exec ipython "$IPYTHON_OPTS" -i -c "%run $IPYTHONSTARTUP" + exec ipython $IPYTHON_OPTS else exec "$PYSPARK_PYTHON" "$@" fi |