SOURCES: rails-paths.patch - adjust for 2.0.2
glen
glen at pld-linux.org
Sun Oct 12 12:11:10 CEST 2008
Author: glen Date: Sun Oct 12 10:11:09 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adjust for 2.0.2
---- Files affected:
SOURCES:
rails-paths.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/rails-paths.patch
diff -u SOURCES/rails-paths.patch:1.1 SOURCES/rails-paths.patch:1.2
--- SOURCES/rails-paths.patch:1.1 Sun Oct 12 12:07:20 2008
+++ SOURCES/rails-paths.patch Sun Oct 12 12:11:04 2008
@@ -51,7 +51,7 @@
end
def vendor_rails?
-@@ -47,61 +47,10 @@ module Rails
+@@ -47,61 +47,10 @@
end
end
@@ -91,14 +91,14 @@
-
- def load_rubygems
- require 'rubygems'
-- min_version = '1.1.1'
-- unless rubygems_version >= min_version
-- $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+-
+- unless rubygems_version >= '0.9.4'
+- $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
- exit 1
- end
-
- rescue LoadError
-- $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+- $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
- exit 1
- end
-
@@ -166,19 +166,6 @@
end
def default_plugin_locators
-diff --git a/lib/rails/gem_dependency.rb b/lib/rails/gem_dependency.rb
-index 471e03f..f57aaa8 100644
---- a/lib/rails/gem_dependency.rb
-+++ b/lib/rails/gem_dependency.rb
-@@ -33,7 +33,7 @@ module Rails
- if unpacked_paths.empty?
- args = [@name]
- args << @requirement.to_s if @requirement
-- gem *args
-+ gem(*args)
- else
- $LOAD_PATH.unshift File.join(unpacked_paths.first, 'lib')
- ext = File.join(unpacked_paths.first, 'ext')
diff --git a/lib/rails_generator.rb b/lib/rails_generator.rb
index 9f0ffc1..5a55084 100644
--- a/lib/rails_generator.rb
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rails-paths.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list