diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-19 21:48:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-19 21:48:48 -0400 |
| commit | d130e7e628568be9593474fbe5601239c6ce8a2e (patch) | |
| tree | d2a87543685fa5b14a188ce9a6734a27d6ca660a | |
| parent | d38037682584313fff39650bd8e8004c713be66b (diff) | |
propellor spin
| -rw-r--r-- | src/Propellor/Git.hs | 3 | ||||
| -rw-r--r-- | src/Propellor/Message.hs | 11 | ||||
| -rw-r--r-- | src/Propellor/Server.hs | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index 88d5c3ab..73de1def 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -69,7 +69,8 @@ fetchOrigin = do branchref <- getCurrentBranch let originbranch = "origin" </> branchref - void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"] + void $ actionMessage "Pull from central git repository" $ + boolSystem "git" [Param "fetch"] oldsha <- getCurrentGitSha1 branchref diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index a5d4d2ca..244913ea 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -15,16 +15,19 @@ import Control.Applicative import Propellor.Types import Utility.Monad import Utility.Env +import Utility.FileSystemEncoding data MessageHandle = ConsoleMessageHandle | TextMessageHandle mkMessageHandle :: IO MessageHandle -mkMessageHandle = ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "PROPELLOR_CONSOLE")) - ( return ConsoleMessageHandle - , return TextMessageHandle - ) +mkMessageHandle = do + fileEncoding stdout + ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "PROPELLOR_CONSOLE")) + ( return ConsoleMessageHandle + , return TextMessageHandle + ) forceConsole :: IO () forceConsole = void $ setEnv "PROPELLOR_CONSOLE" "1" True diff --git a/src/Propellor/Server.hs b/src/Propellor/Server.hs index 182cc2b5..513a81f4 100644 --- a/src/Propellor/Server.hs +++ b/src/Propellor/Server.hs @@ -20,7 +20,7 @@ import Utility.FileMode import Utility.SafeCommand -- Update the privdata, repo url, and git repo over the ssh --- connection, talking the the user's local propellor instance which is +-- connection, talking to the user's local propellor instance which is -- running the updateServer update :: IO () update = do |