spark-class merge

Merge branch 'master_nravi' of https://github.com/nishkamravi2/spark into master_nravi Conflicts: bin/spark-class
nemccarthy · Mar 20, 2015 · 345206a · 345206a
2 parents ac58975 + 06bfeb0
commit 345206a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/spark-class b/bin/spark-class
@@ -44,12 +44,12 @@ fi
 SPARK_ASSEMBLY_JAR=
 ASSEMBLY_DIR="$SPARK_HOME/lib"
 num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^spark-assembly.*\.jar$" | wc -l)"
-ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^spark-assembly.*\.jar$" || true)"
 if [ "$num_jars" -eq "0" -a -z "$SPARK_ASSEMBLY_JAR" ]; then
   echo "Failed to find Spark assembly in $ASSEMBLY_DIR." 1>&2
   echo "You need to build Spark before running this program." 1>&2
   exit 1
 fi
+ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^spark-assembly.*\.jar$" || true)"
 if [ "$num_jars" -gt "1" ]; then
   echo "Found multiple Spark assembly jars in $ASSEMBLY_DIR:" 1>&2
   echo "$ASSEMBLY_JARS" 1>&2

diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -341,7 +341,7 @@ private String findAssembly(String scalaVersion) {
       libdir = new File(sparkHome, String.format("assembly/target/scala-%s", scalaVersion));
     }
 
-    final Pattern re = Pattern.compile("spark-assembly.*[hadoop]*.*\\.jar");
+    final Pattern re = Pattern.compile("spark-assembly.*\\.jar");
     FileFilter filter = new FileFilter() {
       @Override
       public boolean accept(File file) {