Merge branch 'joeyconfig'
This commit is contained in:
commit
37cf983363
|
@ -1,4 +1,4 @@
|
|||
propellor (2.7.0) UNRELEASED; urgency=medium
|
||||
propellor (2.7.0) unstable; urgency=medium
|
||||
|
||||
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword
|
||||
and ForcedCommandsOnly (API change)
|
||||
|
@ -8,8 +8,11 @@ propellor (2.7.0) UNRELEASED; urgency=medium
|
|||
* Added onChangeFlagOnFail which is often a safer alternative to
|
||||
onChange.
|
||||
Thanks, Antoine Eiche.
|
||||
* Work around broken git pull option parser in git 2.5.0,
|
||||
which broke use of --upload-pack to send a git push when running
|
||||
propellor --spin.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400
|
||||
-- Joey Hess <id@joeyh.name> Thu, 30 Jul 2015 12:05:46 -0400
|
||||
|
||||
propellor (2.6.0) unstable; urgency=medium
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Name: propellor
|
||||
Version: 2.6.0
|
||||
Version: 2.7.0
|
||||
Cabal-Version: >= 1.8
|
||||
License: BSD3
|
||||
Maintainer: Joey Hess <id@joeyh.name>
|
||||
|
|
|
@ -147,11 +147,15 @@ update forhost = do
|
|||
hout <- dup stdOutput
|
||||
hClose stdin
|
||||
hClose stdout
|
||||
-- Not using git pull because git 2.5.0 badly
|
||||
-- broke its option parser.
|
||||
unlessM (boolSystem "git" (pullparams hin hout)) $
|
||||
errorMessage "git pull from client failed"
|
||||
errorMessage "git fetch from client failed"
|
||||
unlessM (boolSystem "git" [Param "merge", Param "FETCH_HEAD"]) $
|
||||
errorMessage "git merge from client failed"
|
||||
where
|
||||
pullparams hin hout =
|
||||
[ Param "pull"
|
||||
[ Param "fetch"
|
||||
, Param "--progress"
|
||||
, Param "--upload-pack"
|
||||
, Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout
|
||||
|
|
Loading…
Reference in New Issue