diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 15:23:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 15:23:33 -0400 |
| commit | 4cb37fc564801075560d55bd4b079e915cfa7977 (patch) | |
| tree | 4a44d1955b786beaa40dcc2770d6e2381b6bfb0b | |
| parent | 77f79fa03233db11c7249c725531840d9038c8e7 (diff) | |
| parent | 8e45b0f77bb7f4dbf7572b126f2959afc63d5ce9 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/wrapper.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs index 7f681641..f323a541 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -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 |