kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r8112 from trunk (#9748). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8160 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-12-10 12:08:55 +00:00
parent 65a7c7e96c
commit 166c3c15dd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/redmine/configuration.rb
View File

@ -79,7 +79,13 @@ module Redmine
private
def load_from_yaml(filename, env)
yaml = YAML::load_file(filename)
yaml = nil
begin
yaml = YAML::load_file(filename)
rescue ArgumentError
$stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
exit 1
end
conf = {}
if yaml.is_a?(Hash)
if yaml['default']
@ -89,7 +95,7 @@ module Redmine
conf.merge!(yaml[env])
end
else
$stderr.puts "#{filename} is not a valid Redmine configuration file"
$stderr.puts "Your Redmine configuration file located at #{filename} is not a valid Redmine configuration file."
exit 1
end
conf