From a8b06e0e9aec0fe7ea92d95cceecfce2d025b772 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 25 Apr 2012 10:43:21 +0300
Subject: [PATCH] Fixed yesod devel flag checking

---
 yesod/Devel.hs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/yesod/Devel.hs b/yesod/Devel.hs
index af80a98f..8ba8f2aa 100644
--- a/yesod/Devel.hs
+++ b/yesod/Devel.hs
@@ -139,7 +139,7 @@ checkCabalFile :: D.GenericPackageDescription -> IO [FilePath]
 checkCabalFile gpd = case D.condLibrary gpd of
     Nothing -> failWith "incorrect cabal file, no library"
     Just ct ->
-      case lookupDevelLib ct of
+      case lookupDevelLib gpd ct of
         Nothing   ->
           failWith "no development flag found in your configuration file. Expected a 'library-only' flag or the older 'devel' flag"
         Just dLib -> do
@@ -196,14 +196,13 @@ ghcPackageArgs isCabalDev ghcVer
            | otherwise      = selectOpts opts (x2:xs)
         selectOpts _ _ = []
 
-lookupDevelLib :: D.CondTree D.ConfVar c a -> Maybe a
-lookupDevelLib ct | found     = Just (D.condTreeData ct)
-                  | otherwise = Nothing
+lookupDevelLib :: D.GenericPackageDescription -> D.CondTree D.ConfVar c a -> Maybe a
+lookupDevelLib gpd ct | found     = Just (D.condTreeData ct)
+                      | otherwise = Nothing
   where
-    found = not . null . map (\(_,x,_) -> D.condTreeData x) .
-            filter isDevelLib . D.condTreeComponents  $ ct
-    isDevelLib (D.Var (D.Flag (D.FlagName f)), _, _) = f `elem` ["library-only", "devel"]
-    isDevelLib _                                       = False
+    flags = map (unFlagName . D.flagName) $ D.genPackageFlags gpd
+    unFlagName (D.FlagName x) = x
+    found = any (`elem` ["library-only", "devel"]) flags
 
 -- | Acts like @rawSystem@, but filters out lines from the output that we're not interested in seeing.
 rawSystemFilter :: String -> [String] -> IO ExitCode