From f387bbcf2d7417cf9389eff92d12f28af26cce3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jul 2015 12:01:15 -0400 Subject: [PATCH 1/5] 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. --- debian/changelog | 3 +++ src/Propellor/Spin.hs | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4fcf35..2375dfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ 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 Mon, 20 Jul 2015 12:01:38 -0400 diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 3ff1ec2..61d519c 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -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 From 437bd875629ca47b01a2079c166a707d5d3cbb4b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jul 2015 12:01:28 -0400 Subject: [PATCH 2/5] propellor spin From 852476a2e44967e3f2746d4dc83d1dd3064e0d71 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jul 2015 12:02:08 -0400 Subject: [PATCH 3/5] propellor spin From 4691976aa6a2e3bee3c7d50c470444c574454754 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jul 2015 12:04:36 -0400 Subject: [PATCH 4/5] propellor spin From 6fe4b0cd9174aad50987a41784f2e63cf8f1ddd1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jul 2015 12:05:49 -0400 Subject: [PATCH 5/5] prep release --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2375dfd..2decb1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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) @@ -12,7 +12,7 @@ propellor (2.7.0) UNRELEASED; urgency=medium which broke use of --upload-pack to send a git push when running propellor --spin. - -- Joey Hess Mon, 20 Jul 2015 12:01:38 -0400 + -- Joey Hess Thu, 30 Jul 2015 12:05:46 -0400 propellor (2.6.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index b60379e..01c867c 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 2.6.0 +Version: 2.7.0 Cabal-Version: >= 1.8 License: BSD3 Maintainer: Joey Hess