From b7d78e679ab94a93732f48f4446c1b55bf3dae32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Nov 2014 21:51:52 -0400 Subject: sigel didn't work out Unicode output failed in docker, due to no locales, and would be generally shakey from haskell in all the environments propellor needs to run in. --- src/Propellor/Message.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index 7e386541..09a92538 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -60,7 +60,6 @@ actionMessage' mhn desc a = do liftIO $ do whenConsole h $ setTitle "propellor: running" - putStr propellorSigel showhn h mhn putStr $ desc ++ " ... " let (msg, intensity, color) = getActionResult r @@ -80,12 +79,12 @@ actionMessage' mhn desc a = do warningMessage :: MonadIO m => String -> m () warningMessage s = liftIO $ do h <- mkMessageHandle - colorLine h Vivid Magenta $ propellorSigel ++ "** warning: " ++ s + colorLine h Vivid Magenta $ "** warning: " ++ s errorMessage :: MonadIO m => String -> m a errorMessage s = liftIO $ do h <- mkMessageHandle - colorLine h Vivid Red $ propellorSigel ++ "** error: " ++ s + colorLine h Vivid Red $ "** error: " ++ s error "Cannot continue!" colorLine :: MessageHandle -> ColorIntensity -> Color -> String -> IO () @@ -114,6 +113,3 @@ checkDebugMode = go =<< getEnv "PROPELLOR_DEBUG" updateGlobalLogger rootLoggerName $ setLevel DEBUG . setHandlers [f] go _ = noop - -propellorSigel :: String -propellorSigel = "* " -- cgit v1.2.3