From a50db301853b5d6dfd8c95813f47520740c5485d Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 29 Dec 2013 20:53:38 +0100
Subject: [PATCH] Don't install recommended packages

---
 common/tasks/apt.py      | 24 ++++++++++++++++--------
 common/tasks/packages.py |  7 +++++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/common/tasks/apt.py b/common/tasks/apt.py
index 3464fca..9e17924 100644
--- a/common/tasks/apt.py
+++ b/common/tasks/apt.py
@@ -58,7 +58,8 @@ class AptUpdate(Task):
 	predecessors = [locale.GenerateLocale, WriteSources]
 
 	def run(self, info):
-		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'update'])
+		log_check_call(['/usr/sbin/chroot', info.root,
+		                '/usr/bin/apt-get', 'update'])
 
 
 class AptUpgrade(Task):
@@ -67,11 +68,15 @@ class AptUpgrade(Task):
 	predecessors = [AptUpdate, DisableDaemonAutostart]
 
 	def run(self, info):
-		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get',
-		                                               '--fix-broken',
-		                                               '--assume-yes',
-		                                               'install'])
-		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', '--assume-yes', 'upgrade'])
+		log_check_call(['/usr/sbin/chroot', info.root,
+		                '/usr/bin/apt-get', 'install',
+		                                    '--fix-broken',
+		                                    '--no-install-recommends',
+		                                    '--assume-yes'])
+		log_check_call(['/usr/sbin/chroot', info.root,
+		                '/usr/bin/apt-get', 'upgrade',
+		                                    '--no-install-recommends',
+		                                    '--assume-yes'])
 
 
 class PurgeUnusedPackages(Task):
@@ -79,7 +84,9 @@ class PurgeUnusedPackages(Task):
 	phase = phases.system_cleaning
 
 	def run(self, info):
-		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'autoremove', '--purge'])
+		log_check_call(['/usr/sbin/chroot', info.root,
+		                '/usr/bin/apt-get', 'autoremove',
+		                                    '--purge'])
 
 
 class AptClean(Task):
@@ -87,7 +94,8 @@ class AptClean(Task):
 	phase = phases.system_cleaning
 
 	def run(self, info):
-		log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'clean'])
+		log_check_call(['/usr/sbin/chroot', info.root,
+		                '/usr/bin/apt-get', 'clean'])
 
 		lists = os.path.join(info.root, 'var/lib/apt/lists')
 		for list_file in [os.path.join(lists, f) for f in os.listdir(lists)]:
diff --git a/common/tasks/packages.py b/common/tasks/packages.py
index bd42ccf..a56d112 100644
--- a/common/tasks/packages.py
+++ b/common/tasks/packages.py
@@ -27,8 +27,11 @@ class InstallRemotePackages(Task):
 		try:
 			env = os.environ.copy()
 			env['DEBIAN_FRONTEND'] = 'noninteractive'
-			log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'install',
-			                '--assume-yes'] + packages,
+			log_check_call(['/usr/sbin/chroot', info.root,
+			                '/usr/bin/apt-get', 'install',
+			                                    '--no-install-recommends',
+			                                    '--assume-yes']
+			               + packages,
 			               env=env)
 		except CalledProcessError as e:
 			disk_stat = os.statvfs(info.root)