Merge pull request #1780 from ThomasWaldmann/fix-centos6-testing

vagrant: do not try to install llfuse on centos6

Vagrantfile

@@ -40,8 +40,8 @@ def packages_debianoid
   EOF
 end
 
-def packages_redhatted
-  return <<-EOF
+def packages_redhatted(version)
+  script = <<-EOF
     yum install -y epel-release
     yum update -y
     # for building borgbackup and dependencies:
@@ -58,6 +58,13 @@ def packages_redhatted
     #pip install virtualenv
     touch ~vagrant/.bash_profile ; chown vagrant ~vagrant/.bash_profile
   EOF
+  if version == "centos6"
+    script += <<-EOF
+      # avoid that breaking llfuse install breaks borgbackup install under tox:
+      sed -i.bak '/fuse.txt/d' /vagrant/borg/borg/tox.ini
+    EOF
+  end
+  return script
 end
 
 def packages_darwin
@@ -376,7 +383,7 @@ Vagrant.configure(2) do |config|
     b.vm.provider :virtualbox do |v|
       v.memory = 768
     end
-    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted
+    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted("centos7")
     b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("centos7_64")
     b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("centos7_64")
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("centos7_64")
@@ -386,7 +393,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.define "centos6_32" do |b|
     b.vm.box = "centos6-32"
-    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted
+    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted("centos6")
     b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("centos6_32")
     b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("centos6_32")
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("centos6_32")
@@ -399,7 +406,7 @@ Vagrant.configure(2) do |config|
     b.vm.provider :virtualbox do |v|
       v.memory = 768
     end
-    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted
+    b.vm.provision "install system packages", :type => :shell, :inline => packages_redhatted("centos6")
     b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("centos6_64")
     b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("centos6_64")
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("centos6_64")