diff options
Diffstat (limited to 'lib/redmine/scm/adapters')
| -rw-r--r-- | lib/redmine/scm/adapters/abstract_adapter.rb | 8 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/mercurial_adapter.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/subversion_adapter.rb | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index d66f0da25..694273a71 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -247,11 +247,7 @@ module Redmine io.close_write unless options[:write_stdin] block.call(io) if block_given? end - ## If scm command does not exist, - ## Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException - ## in production environment. - # rescue Errno::ENOENT => e - rescue Exception => e + rescue => e msg = strip_credential(e.message) # The command failed, log it and re-raise logmsg = "SCM command failed, " @@ -282,7 +278,7 @@ module Redmine str.force_encoding(from) begin str.encode(to) - rescue Exception => err + rescue => err logger.error("failed to convert from #{from} to #{to}. #{err}") nil end diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index d5a87f2b3..f882b08cb 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -92,7 +92,7 @@ module Redmine :lastrev => Revision.new(:revision => tip['revision'], :scmid => tip['node'])) # rescue HgCommandAborted - rescue Exception => e + rescue => e logger.error "hg: error during getting info: #{e.message}" nil end diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index 5ee7159c0..ad4d7c281 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -115,7 +115,7 @@ module Redmine }) }) end - rescue Exception => e + rescue => e logger.error("Error parsing svn output: #{e.message}") logger.error("Output was:\n #{output}") end |