From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 30 Aug 2016 19:23:40 +0000 (+0200)
Subject: buildserver: vagrant-cachier conflicts with custom apt cache
X-Git-Tag: 0.8~165^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dc2f53b48c854b40204ff9fbc3cd99381ec4a79c;p=fdroidserver.git

buildserver: vagrant-cachier conflicts with custom apt cache

The technique where /var/cache/apt is mounted as a shared folder conflicts
with vagrant-cachier's workings.  Therefore, ignore vagrant-cachier if the
user selects ./makebuildserver's custom apt cache.  The shared folder way
has the advantage for CI builds of storing the cache outside of
VAGRANT_HOME, which is set to be in the git project.  That gets wiped by
`git clean -fdx` on each CI build.
---

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index e586e05c..a7b1745f 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -4,7 +4,8 @@ configfile = YAML.load_file('Vagrantfile.yaml')
 
 Vagrant.configure("2") do |config|
 
-  if Vagrant.has_plugin?("vagrant-cachier")
+  # these two caching methods conflict, so only use one at a time
+  if Vagrant.has_plugin?("vagrant-cachier") and not configfile.has_key? "aptcachedir"
     config.cache.scope = :box
     config.cache.auto_detect = false
     config.cache.enable :apt