From 82bf4bee15bb449a418290c0c07652e9a8ec8fdd Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Fri, 26 Dec 2014 22:55:04 -0800
Subject: HOTFIX: Slight tweak on previous commit.

Meant to merge this in when committing SPARK-3787.
---
 project/SparkBuild.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'project/SparkBuild.scala')

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 4d103f9dc0..c512b62f61 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -114,10 +114,12 @@ object SparkBuild extends PomBuild {
 
   override val userPropertiesMap = System.getProperties.toMap
 
+  // Handle case where hadoop.version is set via profile.
+  // Needed only because we read back this property in sbt
+  // when we create the assembly jar.
   val pom = loadEffectivePom(new File("pom.xml"),
     profiles = profiles,
     userProps = userPropertiesMap)
-
   if (System.getProperty("hadoop.version") == null) {
     System.setProperty("hadoop.version",
       pom.getProperties.get("hadoop.version").asInstanceOf[String])
-- 
cgit v1.2.3