From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 May 2011 20:35:59 +0000 (+0100)
Subject: Use a pessimistic version constraint for libxml
X-Git-Tag: live~6859^2~3
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d49e3b0f09e5f61b650808c8a7b04f41a25103d7?ds=sidebyside;hp=--cc

Use a pessimistic version constraint for libxml

It seems that rails doesn't handle gems wth multiple version
constraints right - it generates invalid install commands. So
we use a pessimistic constraint instead.
---

d49e3b0f09e5f61b650808c8a7b04f41a25103d7
diff --git a/config/environment.rb b/config/environment.rb
index 15ec24579..58d9432f5 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -18,7 +18,7 @@ Rails::Initializer.run do |config|
   unless  STATUS == :database_offline
     config.gem 'composite_primary_keys', :version => '2.2.2'
   end
-  config.gem 'libxml-ruby', :version => ['>= 1.1.1', ' < 2.0.0'], :lib => 'libxml'
+  config.gem 'libxml-ruby', :version => '~> 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.4.3'
   config.gem 'oauth-plugin', :version => '0.3.14'