From ca044113f38ed900fe30790c87a87089e4e9bcee Mon Sep 17 00:00:00 2001
From: Alexey Gaziev <alex.gaziev@gmail.com>
Date: Mon, 20 Jun 2011 19:54:37 +0400
Subject: Fix regexp in generators for right catching error message
---
railties/lib/rails/generators.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'railties/lib')
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 355b05ce0b..bf1b7a5e85 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -300,7 +300,7 @@ module Rails
rescue LoadError => e
raise unless e.message =~ /#{Regexp.escape(path)}$/
rescue NameError => e
- raise unless e.message =~ /Rails::Generator([\s(::)]|$)/
+ raise unless e.message =~ /Rails::Generator(\s|::|$)/
warn "[WARNING] Could not load generator #{path.inspect} because it's a Rails 2.x generator, which is not supported anymore. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
rescue Exception => e
warn "[WARNING] Could not load generator #{path.inspect}. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
--
cgit v1.2.3
From 78cd3f9ec262a6da8283a6ec95751a0bcd776051 Mon Sep 17 00:00:00 2001
From: Alexey Gaziev <alex.gaziev@gmail.com>
Date: Mon, 20 Jun 2011 20:13:52 +0400
Subject: Removed rescue branch for Rails 2.x compatibility
---
railties/lib/rails/generators.rb | 3 ---
1 file changed, 3 deletions(-)
(limited to 'railties/lib')
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index bf1b7a5e85..ea9f023511 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -299,9 +299,6 @@ module Rails
return
rescue LoadError => e
raise unless e.message =~ /#{Regexp.escape(path)}$/
- rescue NameError => e
- raise unless e.message =~ /Rails::Generator(\s|::|$)/
- warn "[WARNING] Could not load generator #{path.inspect} because it's a Rails 2.x generator, which is not supported anymore. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
rescue Exception => e
warn "[WARNING] Could not load generator #{path.inspect}. Error: #{e.message}.\n#{e.backtrace.join("\n")}"
end
--
cgit v1.2.3