Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 17:09:54 -04:00
commit 16c33945e2
1 changed files with 7 additions and 3 deletions

View File

@ -112,12 +112,13 @@ wrapper args propellordir propellorbin = do
setupupstreammaster :: String -> FilePath -> IO ()
setupupstreammaster newref propellordir = do
changeWorkingDirectory propellordir
go =<< catchMaybeIO (readProcess "git" ["show-ref", upstreambranch, "--hash"])
go =<< catchMaybeIO getoldrev
where
go Nothing = warnoutofdate False
go (Just oldref) = do
let tmprepo = ".git/propellordisttmp"
removeDirectoryRecursive tmprepo
let cleantmprepo = void $ catchMaybeIO $ removeDirectoryRecursive tmprepo
cleantmprepo
git ["clone", "--quiet", ".", tmprepo]
changeWorkingDirectory tmprepo
@ -127,8 +128,11 @@ setupupstreammaster newref propellordir = do
git ["commit", "-a", "-m", "merging upstream changes", "--quiet"]
fetchUpstreamBranch propellordir tmprepo
removeDirectoryRecursive tmprepo
cleantmprepo
warnoutofdate True
getoldrev = takeWhile (/= '\n')
<$> readProcess "git" ["show-ref", upstreambranch, "--hash"]
git = run "git"
run cmd ps = unlessM (boolSystem cmd (map Param ps)) $