cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-30 20:23:23 -04:00
parent 614d497895
commit e563b8cdf6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PrivData.hs
View File

@ -9,6 +9,7 @@ import Data.Maybe
import Control.Monad import Control.Monad
import Types import Types
import Property
import Utility.Monad import Utility.Monad
import Utility.PartialPrelude import Utility.PartialPrelude
import Utility.Exception import Utility.Exception
@ -29,8 +30,7 @@ withPrivData :: PrivDataField -> (String -> IO Result) -> IO Result
withPrivData field a = maybe missing a =<< getPrivData field withPrivData field a = maybe missing a =<< getPrivData field
where where
missing = do missing = do
hPutStrLn stderr $ "** Missing privdata " ++ show field warningMessage $ "Missing privdata " ++ show field
hFlush stderr
return FailedChange return FailedChange
getPrivData :: PrivDataField -> IO (Maybe String) getPrivData :: PrivDataField -> IO (Maybe String)

7
Property.hs
View File

@ -116,3 +116,10 @@ ensureProperties' ps = ensure ps NoChange
putStrLn "done" putStrLn "done"
setSGR [] setSGR []
ensure ls (combineResult r rs) ensure ls (combineResult r rs)
warningMessage :: String -> IO ()
warningMessage s = do
setSGR [SetColor Foreground Vivid Red]
putStrLn $ "** warning: " ++ s
setSGR []
hFlush stdout