diff options
| -rw-r--r-- | src/Propellor/Property/Apt.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 95f74b22..eae56ab5 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -154,7 +154,7 @@ installed = installed' ["-y"] installed' :: [String] -> [Package] -> Property NoInfo installed' params ps = robustly $ check (isInstallable ps) go - `describe` (unwords $ "apt installed":ps) + `describe` unwords ("apt installed":ps) where go = runApt (params ++ ["install"] ++ ps) @@ -168,7 +168,7 @@ installedBackport ps = withOS desc $ \o -> case o of `changesFile` dpkgStatus _ -> notsupported o where - desc = (unwords $ "apt installed backport":ps) + desc = unwords ("apt installed backport":ps) notsupported o = error $ "backports not supported on " ++ show o -- | Minimal install of package, without recommends. @@ -177,12 +177,12 @@ installedMin = installed' ["--no-install-recommends", "-y"] removed :: [Package] -> Property NoInfo removed ps = check (or <$> isInstalled' ps) (runApt (["-y", "remove"] ++ ps)) - `describe` (unwords $ "apt removed":ps) + `describe` unwords ("apt removed":ps) buildDep :: [Package] -> Property NoInfo buildDep ps = robustly $ go `changesFile` dpkgStatus - `describe` (unwords $ "apt build-dep":ps) + `describe` unwords ("apt build-dep":ps) where go = runApt $ ["-y", "build-dep"] ++ ps @@ -331,7 +331,7 @@ hasForeignArch :: String -> Property NoInfo hasForeignArch arch = check notAdded (add `before` update) `describe` ("dpkg has foreign architecture " ++ arch) where - notAdded = (not . elem arch . lines) <$> readProcess "dpkg" ["--print-foreign-architectures"] + notAdded = (notElem arch . lines) <$> readProcess "dpkg" ["--print-foreign-architectures"] add = cmdProperty "dpkg" ["--add-architecture", arch] `assume` MadeChange |