summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2016-03-30 10:44:27 -0400
committerJoey Hess2016-03-30 10:44:27 -0400
commitadc7dad3d8b86b1ad770d1c82a66cd4df7bbee20 (patch)
treea7e78ea9e9a6629d86741e592eb03be79224e69f /src/Propellor
parent27215363dd9babb0d486521543b930915619e82e (diff)
Apt.update: Also run dpkg --configure -a here as apt for some reason won't even update if dpkg was interrupted.
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Apt.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs
index 7301a6ae..b9182baf 100644
--- a/src/Propellor/Property/Apt.hs
+++ b/src/Propellor/Property/Apt.hs
@@ -119,9 +119,11 @@ noninteractiveEnv =
]
update :: Property NoInfo
-update = runApt ["update"]
- `assume` MadeChange
- `describe` "apt update"
+update = combineProperties ("apt update")
+ [ pendingConfigured
+ , runApt ["update"]
+ `assume` MadeChange
+ ]
-- | Have apt upgrade packages, adding new packages and removing old as
-- necessary.