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

Merged r5999 from trunk.

Browse Source 
scm: catch all exceptions to get scm command version in repository model.

If scm command does not exist,
Linux jruby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException in production environment.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6000 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-06-03 11:41:34 +00:00
parent 0e6cdeb860
commit dc2efa503a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/repository.rb
View File

@ -276,7 +276,7 @@ class Repository < ActiveRecord::Base
ret = "" ret = ""
begin begin
ret = self.scm_adapter_class.client_command if self.scm_adapter_class ret = self.scm_adapter_class.client_command if self.scm_adapter_class
rescue Redmine::Scm::Adapters::CommandFailed => e rescue Exception => e
logger.error "scm: error during get command: #{e.message}" logger.error "scm: error during get command: #{e.message}"
end end
ret ret
@ -286,7 +286,7 @@ class Repository < ActiveRecord::Base
ret = "" ret = ""
begin begin
ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
rescue Redmine::Scm::Adapters::CommandFailed => e rescue Exception => e
logger.error "scm: error during get version string: #{e.message}" logger.error "scm: error during get version string: #{e.message}"
end end
ret ret
@ -296,7 +296,7 @@ class Repository < ActiveRecord::Base
ret = false ret = false
begin begin
ret = self.scm_adapter_class.client_available if self.scm_adapter_class ret = self.scm_adapter_class.client_available if self.scm_adapter_class
rescue Redmine::Scm::Adapters::CommandFailed => e rescue Exception => e
logger.error "scm: error during get scm available: #{e.message}" logger.error "scm: error during get scm available: #{e.message}"
end end
ret ret