diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-12-09 17:13:17 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-12-11 11:09:31 +1100 |
| commit | 92eff943b20e6658b92dfaa7e83ff5a70dbc93d4 (patch) | |
| tree | 5fe69fb6e5bdd2cf5a228e14f37f7ff5644ae258 | |
| parent | 8bb8c05830e5ca41d96edc393fb4adf9f4fe2931 (diff) | |
I don't think we need to support Lenny any more
| -rw-r--r-- | config/initializers/alaveteli.rb | 5 | ||||
| -rw-r--r-- | lib/old_rubygems_patch.rb | 46 |
2 files changed, 0 insertions, 51 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 6f018ae1d..a2b9b5c38 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -22,11 +22,6 @@ load "config.rb" load "format.rb" load "debug_helpers.rb" load "util.rb" -# Patch Rails::GemDependency to cope with older versions of rubygems, e.g. in Debian Lenny -# Restores override removed in https://github.com/rails/rails/commit/c20a4d18e36a13b5eea3155beba36bb582c0cc87 -# without effecting method behaviour -# and adds fallback gem call removed in https://github.com/rails/rails/commit/4c3725723f15fab0a424cb1318b82b460714b72f -require File.join(File.dirname(__FILE__), '../../lib/old_rubygems_patch') require 'configuration' # Application version diff --git a/lib/old_rubygems_patch.rb b/lib/old_rubygems_patch.rb deleted file mode 100644 index 3001a7381..000000000 --- a/lib/old_rubygems_patch.rb +++ /dev/null @@ -1,46 +0,0 @@ -if File.exist? File.join(File.dirname(__FILE__),'..','vendor','rails','railties','lib','rails','gem_dependency.rb') - require File.join(File.dirname(__FILE__),'..','vendor','rails','railties','lib','rails','gem_dependency.rb') -else - require 'rails/gem_dependency' -end - -module Rails - class GemDependency < Gem::Dependency - - # This definition of the requirement method is a patch - if !method_defined?(:requirement) - def requirement - req = version_requirements - end - end - - def add_load_paths - self.class.add_frozen_gem_path - return if @loaded || @load_paths_added - if framework_gem? - @load_paths_added = @loaded = @frozen = true - return - end - - begin - dep = Gem::Dependency.new(name, requirement) - spec = Gem.source_index.find { |_,s| s.satisfies_requirement?(dep) }.last - spec.activate # a way that exists - rescue - begin - gem self.name, self.requirement # < 1.8 unhappy way - # This second rescue is a patch - fall back to passing Rails::GemDependency to gem - # for older rubygems - rescue ArgumentError - gem self - end - end - - @spec = Gem.loaded_specs[name] - @frozen = @spec.loaded_from.include?(self.class.unpacked_path) if @spec - @load_paths_added = true - rescue Gem::LoadError - end - end - -end |