From 6bde26780f2e29ee9c1503b68b12854114474898 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Apr 2014 20:40:38 -0400 Subject: updates --- Propellor/Property/Apt.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Propellor/Property') diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs index 867e6bb7..2d7c927c 100644 --- a/Propellor/Property/Apt.hs +++ b/Propellor/Property/Apt.hs @@ -84,6 +84,10 @@ installed ps = robustly $ check (isInstallable ps) go where go = runApt $ ["-y", "install"] ++ ps +-- | Minimal install of package, without recommends. +installedMin :: [Package] -> Property +installedMin ps = installed ("--no-install-recommends" : ps) + removed :: [Package] -> Property removed ps = check (or <$> isInstalled' ps) go `describe` (unwords $ "apt removed":ps) @@ -100,7 +104,7 @@ buildDep ps = robustly go -- in the specifed directory, with a dummy package also -- installed so that autoRemove won't remove them. buildDepIn :: FilePath -> Property -buildDepIn dir = go `requires` installed ["devscripts"] +buildDepIn dir = go `requires` installedMin ["devscripts"] where go = cmdProperty' "sh" ["-c", "cd '" ++ dir ++ "' && mk-build-deps debian/control --install --remove"] noninteractiveEnv -- cgit v1.2.3