Skip to content
Browse files

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
  • Loading branch information...
1 parent 93d256c commit 0903db52d92891151aa6498a505b6d9aa0213ab8 @marutosi marutosi committed Jul 15, 2011
Showing with 5 additions and 2 deletions.
  1. +5 −2 lib/redmine/scm/adapters/cvs_adapter.rb
View
7 lib/redmine/scm/adapters/cvs_adapter.rb
@@ -379,13 +379,16 @@ def format_identifier
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

0 comments on commit 0903db5

Please sign in to comment.
Something went wrong with that request. Please try again.