diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-05 18:51:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-05 18:51:17 -0400 |
| commit | 4fe1dcb6142d4033482d6f25b916b64926bc7b3f (patch) | |
| tree | fd8597ccbb3c591e118da4edaa8da650f075f3bf /src/Propellor/Property/Apt.hs | |
| parent | 97a224b194b96184c7938de0bb1e1f423612ccbc (diff) | |
| parent | 5cfb20668421acb3c0de133afe973fc693b8b320 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Apt.hs')
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index cf81c9be..26c151d9 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -140,13 +140,13 @@ installed' params ps = robustly $ check (isInstallable ps) go `assume` MadeChange installedBackport :: [Package] -> Property NoInfo -installedBackport ps = trivial $ withOS desc $ \o -> case o of +installedBackport ps = withOS desc $ \o -> case o of Nothing -> error "cannot install backports; os not declared" (Just (System (Debian suite) _)) -> case backportSuite suite of Nothing -> notsupported o - Just bs -> ensureProperty $ runApt - (["install", "-t", bs, "-y"] ++ ps) - `assume` MadeChange + Just bs -> ensureProperty $ + runApt (["install", "-t", bs, "-y"] ++ ps) + `changesFile` dpkgStatus _ -> notsupported o where desc = (unwords $ "apt installed backport":ps) |