apache/spark — pull request #38 by dianacarroll (2014-02-27 22:43:22+00:00)
Title: SPARK-1134 

bug with ipython: startup scripts are called in both interactive and non-interactive mode. This prevents non-interactive use with spark because the spark startup script and user script both attempt to create a SparkContext. This changes the pyspark script to only call ipython if no command line arguments were supplied, ie: call ipython for interactive use only.