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 15:23:33 -04:00
parent 77f79fa032 8e45b0f77b
commit 4cb37fc564
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wrapper.hs
View File

@ -18,7 +18,6 @@ import Utility.UserInfo
import Utility.Monad
import Utility.Process
import Utility.SafeCommand
import Utility.Directory
import Utility.Exception
import Control.Monad
@ -64,11 +63,11 @@ wrapper args propellordir propellorbin = do
disthead = propellordir </> "head"
checkRepo = whenM (doesFileExist disthead) $ do
head <- readFile disthead
headrev <- readFile disthead
changeWorkingDirectory propellordir
headknown <- catchMaybeIO $
withQuietOutput createProcessSuccess $
proc "git" ["log", head]
proc "git" ["log", headrev]
when (headknown == Nothing)
warnoutofdate
warnoutofdate = do