summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 15:23:39 -0400
committerJoey Hess2014-11-18 15:23:39 -0400
commit6cb060b65370966b88f5927fb2396cf039d9ff82 (patch)
treefad4f5422b346f7e5996a947a9da5f96ddd409a8 /src
parentca9578801960975d103a29cac61a98cc7caea972 (diff)
problem running propellor --gitpush
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/CmdLine.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index dcdc64fb..0c092093 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -298,7 +298,7 @@ boot = do
hout <- dup stdOutput
hClose stdin
hClose stdout
- unlessM (boolSystem "git" [Param "pull", Param $ "--upload=pack=./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
+ unlessM (boolSystem "git" [Param "pull", Param "--upload=pack", Param $ "sh -c ./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
warningMessage "git pull from client failed"
-- Shim for git push over the propellor ssh channel.