Unhandled exception when a YAML syntax error is detected in configuration.yml (#35421).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@21057 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
index d2d27f775b04a508d7e026b8cafd92bfac2b01cf..883dc8497ec5c9b5b399859e67e498d6d760bc80 100644 (file)
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -93,8 +93,8 @@ module Redmine
         yaml = nil
         begin
           yaml = YAML::load(ERB.new(File.read(filename)).result)
-        rescue ArgumentError
-          abort "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
+        rescue ArgumentError, Psych::SyntaxError => e
+          abort "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded:\n#{e.message}"
         rescue SyntaxError => e
           abort "A syntax error occurred when parsing your Redmine configuration file located at #{filename} with ERB:\n#{e.message}"
         end