summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2016-03-30 10:45:15 -0400
committerJoey Hess2016-03-30 10:47:31 -0400
commitd08734bbbebc0211d4203922fb94384497547d3c (patch)
treea0a32a5073d05d6ce3c67086ac7ce6948c54f3bc /src
parent4892d4a26c8e542c764bbc64cbe94490c96a14dc (diff)
parentadc7dad3d8b86b1ad770d1c82a66cd4df7bbee20 (diff)
Merge branch 'master' into typed-os-requirements
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Apt.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 1a15f72c..5771750d 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -118,9 +118,10 @@ noninteractiveEnv =
]
update :: Property DebianLike
-update = runApt ["update"]
- `assume` MadeChange
- `describe` "apt update"
+update = combineProperties ("apt update") $ props
+ & pendingConfigured
+ & runApt ["update"]
+ `assume` MadeChange
-- | Have apt upgrade packages, adding new packages and removing old as
-- necessary.