summaryrefslogtreecommitdiff
path: root/Propellor/Property/Apt.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-18 04:48:49 -0400
committerJoey Hess2014-04-18 04:48:49 -0400
commit5f6c3ad56490a8c3063f8daa1cd8b0a302b63ddd (patch)
treea05856a744c7ce6a6be69db327e5b8afec013257 /Propellor/Property/Apt.hs
parent4e4fb9ab7ca13f5148c6d4b08f53f518429530a8 (diff)
All Property combinators now combine together their Attr settings.
So Attr settings can be made inside a propertyList, for example.
Diffstat (limited to 'Propellor/Property/Apt.hs')
-rw-r--r--Propellor/Property/Apt.hs4
1 files changed, 2 insertions, 2 deletions
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