From 7f38b7967b2aabc8ba86cdb860db7294ecb0f054 Mon Sep 17 00:00:00 2001
From: Cesar Blum Silveira <cesars@microsoft.com>
Date: Mon, 11 Apr 2016 11:02:59 -0700
Subject: [PATCH] Properly set commits file location after caching Coherence.

---
 makefile.shade | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/makefile.shade b/makefile.shade
index fb0f880c14..be3dcbc9a6 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -341,7 +341,14 @@ var buildTarget = "compile"
 
             Environment.SetEnvironmentVariable("NUGET_VOLATILE_FEED_ASPNETVNEXT", coherenceCacheDir);
             Environment.SetEnvironmentVariable("NUGET_VOLATILE_FEED_EXTERNAL", Path.Combine(dropsShare, "latest-packages", "external", buildBranch));
-            Environment.SetEnvironmentVariable("UNIVERSE_COMMITS_FILE", universeCommitsFileTarget);
+            
+            // Only update commits file location if it hadn't been previously set
+            if (string.IsNullOrWhiteSpace(universeCommitsFile))
+            {
+                universeCommitsFile = universeCommitsFileTarget;
+                Log.Info("Updating UNIVERSE_COMMITS_FILE to " + universeCommitsFileTarget);
+                Environment.SetEnvironmentVariable("UNIVERSE_COMMITS_FILE", universeCommitsFileTarget);
+            }
         }
     }