From fb98e0aec4110d81d5f59ca7168f76a1253fd706 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:23:49 -0400 Subject: [PATCH] propellor spin --- Propellor/CmdLine.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 4af4bd7..094de65 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]