propellor spin

2 files changed, 7 insertions, 7 deletions

diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index b4260e9f..ed886ef7 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -44,8 +44,8 @@ ensureProperty = catchPropellor . propertySatisfy
 -- For example, `fromHost hosts "otherhost" getSshPubKey`
 fromHost :: [Host] -> HostName -> Propellor a -> Propellor (Maybe a)
 fromHost l hn getter = case findHost l hn of
-	Nothing -> do
-		liftIO $ print "fromHost found Nothing"
-		return Nothing
-	Just h -> liftIO $ Just <$>
-		runReaderT (runWithHost getter) h
+	Nothing -> return Nothing
+	Just h -> liftIO $ do
+		print ("fromHost", hn, "using", h)
+		Just <$>
+			runReaderT (runWithHost getter) h
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 76f03671..5a260476 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -148,8 +148,8 @@ knownHost hosts hn user = property desc $
 			, f `File.containsLine` (hn ++ " " ++ k)
 			, File.ownerGroup f user user
 			]
-	go v = do
-		warningMessage $ "no configred sshPubKey for " ++ hn ++ " " ++ show v
+	go _ = do
+		warningMessage $ "no configred sshPubKey for " ++ hn
 		return FailedChange
 
 -- | Makes a user have authorized_keys from the PrivData