From 0903db52d92891151aa6498a505b6d9aa0213ab8 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 15 Jul 2011 23:46:01 +0000 Subject: [PATCH] Merged r6277 from trunk. scm: cvs: use self.class.sq_bin for command name at adpter scm_cmd(). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6289 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/cvs_adapter.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index 6858fcc60..91e2633da 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -379,13 +379,16 @@ module Redmine end def scm_cmd(*args, &block) - full_args = [CVS_BIN, '-d', root_url] + full_args = ['-d', root_url] full_args += args full_args_locale = [] full_args.map do |e| full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e) end - ret = shellout(full_args_locale.map { |e| shell_quote e.to_s }.join(' '), &block) + ret = shellout( + self.class.sq_bin + ' ' + full_args_locale.map { |e| shell_quote e.to_s }.join(' '), + &block + ) if $? && $?.exitstatus != 0 raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}" end