From ee2236f5bdc07085b2a723e0edf8e46e4d7c6ca2 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 3 Jun 2011 09:54:57 +0000 Subject: [PATCH] scm: catch all exceptions to get scm command version in repository model (#8510). 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/trunk@5999 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/repository.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index df64e501e..cb0500009 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -278,7 +278,7 @@ class Repository < ActiveRecord::Base ret = "" begin 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}" end ret @@ -288,7 +288,7 @@ class Repository < ActiveRecord::Base ret = "" begin 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}" end ret @@ -298,7 +298,7 @@ class Repository < ActiveRecord::Base ret = false begin 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}" end ret