haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix logic of warning messages for widgetFile

Browse Source
This commit is contained in:
Michael Snoyman 2012-03-15 18:35:53 +02:00
parent 83b719f534
commit 21c9e84d4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-default/Yesod/Default/Util.hs
View File

@ -14,7 +14,7 @@ import Control.Monad.IO.Class (liftIO)
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import Data.Text (Text, pack, unpack) import Data.Text (Text, pack, unpack)
import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
import Control.Monad (unless) import Control.Monad (when, unless)
import System.Directory (doesFileExist, createDirectoryIfMissing) import System.Directory (doesFileExist, createDirectoryIfMissing)
import Language.Haskell.TH.Syntax import Language.Haskell.TH.Syntax
import Text.Lucius (luciusFile, luciusFileReload) import Text.Lucius (luciusFile, luciusFileReload)
@ -99,5 +99,5 @@ warnUnlessExists :: Bool -> String -> String -> (FilePath -> Q Exp) -> Q (Maybe
warnUnlessExists shouldWarn x glob f = do warnUnlessExists shouldWarn x glob f = do
let fn = globFile glob x let fn = globFile glob x
e <- qRunIO $ doesFileExist fn e <- qRunIO $ doesFileExist fn
unless (shouldWarn && e) $ qRunIO $ putStrLn $ "widget file not found: " ++ fn when (shouldWarn && not e) $ qRunIO $ putStrLn $ "widget file not found: " ++ fn
if e then fmap Just $ f fn else return Nothing if e then fmap Just $ f fn else return Nothing