From 5f6c3ad56490a8c3063f8daa1cd8b0a302b63ddd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Apr 2014 04:48:49 -0400
Subject: All Property combinators now combine together their Attr settings.

So Attr settings can be made inside a propertyList, for example.
---
 Propellor/Property/Apt.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Propellor/Property/Apt.hs')

diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs
index 2115dc50..9234cbbf 100644
--- a/Propellor/Property/Apt.hs
+++ b/Propellor/Property/Apt.hs
@@ -157,8 +157,8 @@ buildDepIn dir = go `requires` installedMin ["devscripts", "equivs"]
 -- | Package installation may fail becuse the archive has changed.
 -- Run an update in that case and retry.
 robustly :: Property -> Property
-robustly p = property (propertyDesc p) $ do
-	r <- ensureProperty p
+robustly p = adjustProperty p $ \satisfy -> do
+	r <- satisfy
 	if r == FailedChange
 		then ensureProperty $ p `requires` update
 		else return r
-- 
cgit v1.3-2-g0d8e