Fix regexp in generators for right catching error message

This commit is contained in:
Alexey Gaziev
2011-06-20 19:54:37 +04:00
parent 81f7bf55c7
commit ca044113f3

View File

@@ -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")}"