summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 20:23:23 -0400
committerJoey Hess2014-03-30 20:23:23 -0400
commite563b8cdf617a9545919472f2f37bef6050e4e88 (patch)
treec4cfa7cf4bef3e0448deee9456ea1c99dd6d4978
parent614d49789566cdf119997bf12c0d7494e386d4dd (diff)
propellor spin
-rw-r--r--PrivData.hs4
-rw-r--r--Property.hs7
2 files changed, 9 insertions, 2 deletions
diff --git a/PrivData.hs b/PrivData.hs
index 7d652701..e9233660 100644
--- a/PrivData.hs
+++ b/PrivData.hs
@@ -9,6 +9,7 @@ import Data.Maybe
import Control.Monad
import Types
+import Property
import Utility.Monad
import Utility.PartialPrelude
import Utility.Exception
@@ -29,8 +30,7 @@ withPrivData :: PrivDataField -> (String -> IO Result) -> IO Result
withPrivData field a = maybe missing a =<< getPrivData field
where
missing = do
- hPutStrLn stderr $ "** Missing privdata " ++ show field
- hFlush stderr
+ warningMessage $ "Missing privdata " ++ show field
return FailedChange
getPrivData :: PrivDataField -> IO (Maybe String)
diff --git a/Property.hs b/Property.hs
index e83c75de..9361de02 100644
--- a/Property.hs
+++ b/Property.hs
@@ -116,3 +116,10 @@ ensureProperties' ps = ensure ps NoChange
putStrLn "done"
setSGR []
ensure ls (combineResult r rs)
+
+warningMessage :: String -> IO ()
+warningMessage s = do
+ setSGR [SetColor Foreground Vivid Red]
+ putStrLn $ "** warning: " ++ s
+ setSGR []
+ hFlush stdout