From 2a09d69b4c7b4837dfaaaefbe4c0ff39889ecb9b Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Thu, 31 Mar 2016 18:11:24 -0700
Subject: [PATCH] Clean packages after modules.

---
 server/build_image.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/build_image.py b/server/build_image.py
index e07e1c6..61ac1ce 100755
--- a/server/build_image.py
+++ b/server/build_image.py
@@ -184,10 +184,6 @@ class ImageBuilder(object):
         'install',
         '--assume-yes',
         *self._BASE_PACKAGES)
-    self._ExecChroot(
-        chroot_path,
-        'apt-get',
-        'clean')
 
   def _RunModules(self, chroot_path):
     for module in self._modules:
@@ -198,6 +194,12 @@ class ImageBuilder(object):
           },
           shell=True)
 
+  def _CleanPackages(self, chroot_path):
+    self._ExecChroot(
+        chroot_path,
+        'apt-get',
+        'clean')
+
   def _RemoveDiversions(self, chroot_path):
     for source in self._DIVERSIONS:
       self._ExecChroot(
@@ -250,6 +252,7 @@ class ImageBuilder(object):
     self._AddDiversions(chroot_path)
     self._InstallPackages(chroot_path)
     self._RunModules(chroot_path)
+    self._CleanPackages(chroot_path)
     self._RemoveDiversions(chroot_path)
     if FLAGS.shell:
       self._Exec('bash', cwd=root)