Revert "Install filemagic on buildserver"

This reverts commit 255cd05c674579ce2be9d02f509cf902ab7d5bdd.

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 1661a484c31448d1a3b1bfb29f4adc5c75588b3e..880ed93927b4c09eefd4573c931eb9d9faa1ecea 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -1,7 +1,7 @@
 
 user = node[:settings][:user]
 
-%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext python-pip}.each do |pkg|
+%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext}.each do |pkg|
   package pkg do
     action :install
   end
@@ -15,12 +15,6 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
-execute "add-filemagic" do
-  user "root"
-  command "pip install filemagic"
-  not_if "pip list | grep filemagic"
-end
-
 script "install-gradle" do
   cwd "/tmp"
   interpreter "bash"