propellor spin

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
 	

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"))
+mkMessageHandle = do
-	( return ConsoleMessageHandle
+	fileEncoding stdout
-	, return TextMessageHandle
+	ifM (hIsTerminalDevice stdout <||> (isJust <$> getEnv "PROPELLOR_CONSOLE"))
-	)
+		( return ConsoleMessageHandle
+		, return TextMessageHandle
+		)
 
 forceConsole :: IO ()
 forceConsole = void $ setEnv "PROPELLOR_CONSOLE" "1" True

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