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
This commit is contained in:
Toshi MARUYAMA 2011-07-15 23:46:01 +00:00
parent 93d256c4a8
commit 0903db52d9
1 changed files with 5 additions and 2 deletions

View File

@ -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