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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 16:45:00 -04:00
parent 16c01b24ce 4ae9578e36
commit 2ed83d6fcc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wrapper.hs
View File

@ -22,6 +22,7 @@ import Utility.Exception
import Control.Monad import Control.Monad
import Control.Monad.IfElse import Control.Monad.IfElse
import Control.Applicative
import System.Directory import System.Directory
import System.FilePath import System.FilePath
import System.Environment (getArgs) import System.Environment (getArgs)
@ -73,7 +74,7 @@ wrapper args propellordir propellorbin = do
) )
checkRepo = whenM (doesFileExist disthead) $ do checkRepo = whenM (doesFileExist disthead) $ do
headrev <- readFile disthead headrev <- takeWhile (/= '\n') <$> readFile disthead
changeWorkingDirectory propellordir changeWorkingDirectory propellordir
headknown <- catchMaybeIO $ headknown <- catchMaybeIO $
withQuietOutput createProcessSuccess $ withQuietOutput createProcessSuccess $