summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-02 20:44:11 -0400
committerJoey Hess2014-04-02 20:44:11 -0400
commit595794a250a35f3f3613dcf47b955bcdae867e04 (patch)
treeeb6a21cc5241783f37c4f63005e2b04a5694f9b4 /Propellor/Property
parent022e70d82217c5bb2ab23c1a05082d278edb47cd (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Apt.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs
index 2d7c927c..6f2f95d7 100644
--- a/Propellor/Property/Apt.hs
+++ b/Propellor/Property/Apt.hs
@@ -79,14 +79,17 @@ upgrade = runApt ["-y", "dist-upgrade"]
type Package = String
installed :: [Package] -> Property
-installed ps = robustly $ check (isInstallable ps) go
+installed = installed' ["-y"]
+
+installed' :: [String] -> [Package] -> Property
+installed' params ps = robustly $ check (isInstallable ps) go
`describe` (unwords $ "apt installed":ps)
where
- go = runApt $ ["-y", "install"] ++ ps
+ go = runApt $ params ++ ["install"] ++ ps
-- | Minimal install of package, without recommends.
installedMin :: [Package] -> Property
-installedMin ps = installed ("--no-install-recommends" : ps)
+installedMin = installed' ["--no-install-recommends"]
removed :: [Package] -> Property
removed ps = check (or <$> isInstalled' ps) go