SPARK-1134 bug with ipython prevents non-interactive use with spark; …

…only call ipython if no command line arguments were supplied
apache · Feb 27, 2014 · 0309cf9 · 0309cf9
1 parent 12bbca2
commit 0309cf9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bin/pyspark b/bin/pyspark
@@ -58,7 +58,8 @@ if [ -n "$IPYTHON_OPTS" ]; then
   IPYTHON=1
 fi
 
-if [[ "$IPYTHON" = "1" ]] ; then
+# Only use ipython if no command line arguments were provided [SPARK-1134]
+if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
   exec ipython $IPYTHON_OPTS
 else
   exec "$PYSPARK_PYTHON" "$@"