diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-02-29 18:03:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 18:03:22 -0400 |
| commit | 6e429a171394225e79808b8f7dae81e5505e105d (patch) | |
| tree | 1038e625fdf08ef17577cba2775f2ec0a5112b06 /src | |
| parent | df8bf03acf82c701713630857beec443d5291a17 (diff) | |
forgot to build; fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index bb444463..d05bdcb9 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -130,9 +130,9 @@ upgrade = upgrade' "dist-upgrade" upgrade' :: String -> Property NoInfo upgrade' p = combineProperties ("apt " ++ p) - [ runApt ["-y", p] + [ pendingConfigured + , runApt ["-y", p] `assume` MadeChange - , dpkgConfigured ] -- | Have apt upgrade packages, but never add new packages or remove @@ -141,8 +141,10 @@ upgrade' p = combineProperties ("apt " ++ p) safeUpgrade :: Property NoInfo safeUpgrade = upgrade' "upgrade" -dpkgConfigured :: Property NoInfo -dpkgConfigured = cmdProperty "dpkg" ["--confugure", "--pending"] +-- | Have dpkg try to configure any packages that are not fully configured. +pendingConfigured :: Property NoInfo +pendingConfigured = cmdProperty "dpkg" ["--confugure", "--pending"] + `assume` MadeChange `describe` "dpkg configured pending" type Package = String |