summaryrefslogtreecommitdiff
path: root/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 16:23:49 -0400
committerJoey Hess2014-03-31 16:23:49 -0400
commitfb98e0aec4110d81d5f59ca7168f76a1253fd706 (patch)
tree8d0762d92ec3166f50f56ca9bb066f4144ff132e /Propellor/CmdLine.hs
parent0f99fb8ab6d32556c31bcba286837bd2306f8fd8 (diff)
propellor spin
Diffstat (limited to 'Propellor/CmdLine.hs')
-rw-r--r--Propellor/CmdLine.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index 4af4bd77..094de659 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -85,7 +85,7 @@ pullFirst next = do
nukeFile $ privDataDir </> "trustring.gpg"
nukeFile $ privDataDir </> "gpg.conf"
when (s /= "U\n" && s/= "G\n") $
- error $ "git branch" ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!"
+ error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!"
void $ boolSystem "git" [Param "merge", Param originbranch]