From ca044113f38ed900fe30790c87a87089e4e9bcee Mon Sep 17 00:00:00 2001 From: Alexey Gaziev 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') 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