From 45df9127365f8942794273b8ada004bf6ea3ef10 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@databricks.com>
Date: Tue, 1 Apr 2014 19:31:50 -0700
Subject: Revert "[Spark-1134] only call ipython if no arguments are given;
 remove IPYTHONOPTS from call"

This reverts commit afb5ea62786e3ca055e247176def3e7ecf0d2c9d.
---
 bin/pyspark | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

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
-- 
cgit v1.2.3