From 781e35a333d1ca930f9d94c716104c90bf28970d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 15:13:37 -0400 Subject: [PATCH] protocol is one line response, not multiline The privdata is shown, so contains no literal newlines, so that's ok. --- src/Propellor/Protocol.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs index c5ebaab..6394fc7 100644 --- a/src/Propellor/Protocol.hs +++ b/src/Propellor/Protocol.hs @@ -28,7 +28,7 @@ gitPushMarker :: String gitPushMarker = "GITPUSH" toMarked :: Marker -> String -> String -toMarked marker = intercalate "\n" . map (marker ++) . lines +toMarked marker = ++ fromMarked :: Marker -> Marked -> Maybe String fromMarked marker s