From 6bde26780f2e29ee9c1503b68b12854114474898 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Apr 2014 20:40:38 -0400
Subject: [PATCH] updates

---
 Propellor/Property/Apt.hs | 6 +++++-
 TODO                      | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Propellor/Property/Apt.hs b/Propellor/Property/Apt.hs
index 867e6bb..2d7c927 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
diff --git a/TODO b/TODO
index 018ec03..a90875f 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@
   run it once for the whole. For example, may want to restart apache,
   but only once despite many config changes being made to satisfy
   properties. onChange is a poor substitute.
-* I often seem to want to be able to combine Properties monadically.
 * --spin needs 4 ssh connections when bootstrapping a new host
   that does not have the git repo yet. Should be possible to get that
   down to 1.
@@ -12,7 +11,4 @@
 * Display of docker container properties is a bit wonky. It always
   says they are unchanged even when they changed and triggered a
   reprovision.
-* Nothing brings up docker containers on boot. Although the next time
-  propellor runs it will notice if a container is done, and fix it.
-  Should propellor be run on boot? Or should provisioning a container
-  install a systemd service file to start it?
+* Should properties be a tree rather than a list?