convert ensureProperty

Moved to its own module to keep everything related in one place.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index 1f66dda2..2a74b5ed 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -46,8 +46,8 @@ hasPrivContentExposedFrom = hasPrivContent' writeFile
 hasPrivContent' :: (IsContext c, IsPrivDataSource s) => (FilePath -> String -> IO ()) -> s -> FilePath -> c -> Property HasInfo
 hasPrivContent' writer source f context = 
 	withPrivData source context $ \getcontent -> 
-		property desc $ getcontent $ \privcontent -> 
-			ensureProperty $ fileProperty' writer desc
+		property' desc $ \o -> getcontent $ \privcontent -> 
+			ensureProperty o $ fileProperty' writer desc
 				(\_oldcontent -> privDataLines privcontent) f
   where
 	desc = "privcontent " ++ f
@@ -72,10 +72,11 @@ f `lacksLines` ls = fileProperty (f ++ " remove: " ++ show [ls]) (filter (`notEl
 
 -- | Replaces the content of a file with the transformed content of another file
 basedOn :: FilePath -> (FilePath, [Line] -> [Line]) -> Property UnixLike
-f `basedOn` (f', a) = property desc $ go =<< (liftIO $ readFile f')
+f `basedOn` (f', a) = property' desc $ \o -> do
+	tmpl <- liftIO $ readFile f'
+	ensureProperty o $ fileProperty desc (\_ -> a $ lines $ tmpl) f
   where
 	desc = "replace " ++ f
-	go tmpl = ensureProperty $ fileProperty desc (\_ -> a $ lines $ tmpl) f
 
 -- | Removes a file. Does not remove symlinks or non-plain-files.
 notPresent :: FilePath -> Property UnixLike