ported more

Ssh is WIP and failing to compile quite badly

1 files changed, 3 insertions, 7 deletions

diff --git a/src/Propellor/Property/Concurrent.hs b/src/Propellor/Property/Concurrent.hs
index 8d608a54..a86c839f 100644
--- a/src/Propellor/Property/Concurrent.hs
+++ b/src/Propellor/Property/Concurrent.hs
@@ -77,8 +77,8 @@ concurrently p1 p2 = (combineWith go go p1 p2)
 --
 -- The above example will run foo and bar concurrently, and once either of
 -- those 2 properties finishes, will start running baz.
-concurrentList :: IO Int -> Desc -> PropList -> Property HasInfo
-concurrentList getn d (PropList ps) = infoProperty d go mempty ps
+concurrentList :: SingI metatypes => IO Int -> Desc -> Props (MetaTypes metatypes) -> Property (MetaTypes metatypes)
+concurrentList getn d (Props ps) = property d go `modifyChildren` (++ ps)
   where
 	go = do
 		n <- liftIO getn
@@ -97,14 +97,10 @@ concurrentList getn d (PropList ps) = infoProperty d go mempty ps
 			(p:rest) -> return (rest, Just p)
 		case v of
 			Nothing -> return r
-			-- This use of getSatisfy does not lose any
-			-- Info asociated with the property, because
-			-- concurrentList sets all the properties as
-			-- children, and so propigates their info.
 			Just p -> do
 				hn <- asks hostName
 				r' <- actionMessageOn hn
-					(propertyDesc p)
+					(getDesc p)
 					(getSatisfy p)
 				worker q (r <> r')