From 075a8eac5b66f0da4e7054002155ebfddde38f7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 4 Apr 2014 15:58:48 -0400
Subject: propellor spin

---
 Propellor/Property/Docker.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Propellor/Property')

diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 107c542e..6be8c4e2 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE RankNTypes, BangPatterns #-}
 
 -- | Docker support for propellor
 --
@@ -227,7 +227,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
 			-- parameters of the container differ and it must
 			-- be restarted.
 			runningident <- getrunningident
-			print runningident
 			if runningident == Just ident
 				then return NoChange
 				else do
@@ -247,11 +246,11 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
 
 	getrunningident :: IO (Maybe ContainerIdent)
 	getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do
-		print (extractident rs)
-		return $ extractident rs
+		let !v = extractident rs
+		return v
 
 	extractident :: [Resp] -> Maybe ContainerIdent
-	extractident = headMaybe . catMaybes . map (readish :: String -> Maybe ContainerIdent) . catMaybes . map getStdout
+	extractident = headMaybe . catMaybes . map readish . catMaybes . map getStdout
 
 	runps = getRunParams $ containerprops ++
 		-- expose propellor directory inside the container
-- 
cgit v1.3-2-g0d8e