diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-04-01 19:31:50 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-04-01 19:31:50 -0700 |
| commit | 45df9127365f8942794273b8ada004bf6ea3ef10 (patch) | |
| tree | a9163a04b3e62fed5de67a490882ef8e64d536b2 /bin/pyspark | |
| parent | afb5ea62786e3ca055e247176def3e7ecf0d2c9d (diff) | |
| download | spark-45df9127365f8942794273b8ada004bf6ea3ef10.tar.gz spark-45df9127365f8942794273b8ada004bf6ea3ef10.tar.bz2 spark-45df9127365f8942794273b8ada004bf6ea3ef10.zip | |
Revert "[Spark-1134] only call ipython if no arguments are given; remove IPYTHONOPTS from call"
This reverts commit afb5ea62786e3ca055e247176def3e7ecf0d2c9d.
Diffstat (limited to 'bin/pyspark')
| -rwxr-xr-x | bin/pyspark | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/pyspark b/bin/pyspark index 7932a247b5..67e1f61eeb 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -55,9 +55,8 @@ if [ -n "$IPYTHON_OPTS" ]; then IPYTHON=1 fi -# Only use ipython if no command line arguments were provided [SPARK-1134] -if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then - exec ipython +if [[ "$IPYTHON" = "1" ]] ; then + exec ipython $IPYTHON_OPTS else exec "$PYSPARK_PYTHON" "$@" fi |