Hide unrecognized field warnings for default stack-setup-2.yaml (#1040)

commercialhaskell · Sep 25, 2015 · 42bb3b3 · 42bb3b3
1 parent fe880a0
commit 42bb3b3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -531,8 +531,7 @@ getSetupInfo sopts manager = do
             loadSetupInfo
             (SetupInfoFileOrURL (soptsStackSetupYaml sopts) :
              configSetupInfoLocations config)
-    return
-        (mconcat setupInfos)
+    return (mconcat setupInfos)
   where
     loadSetupInfo (SetupInfoInline si) = return si
     loadSetupInfo (SetupInfoFileOrURL urlOrFile) = do
@@ -548,7 +547,8 @@ getSetupInfo sopts manager = do
                     return $ S8.concat bss
                 Nothing -> liftIO $ S.readFile urlOrFile
         (si,warnings) <- either throwM return (Yaml.decodeEither' bs)
-        logJSONWarnings urlOrFile warnings
+        when (urlOrFile /= defaultStackSetupYaml) $
+            logJSONWarnings urlOrFile warnings
         return si
 
 data Tool