diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-07-15 16:30:38 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-07-15 16:30:38 +0000 |
commit | e748e370535f68a279b484a993663b0de4fcb547 (patch) | |
tree | 19877ad823582cf661ea48107304a0b6ec68032c /lib/redmine/scm | |
parent | 7d15b2853ab97eaee7284dedc3e347922ca44f68 (diff) | |
download | redmine-e748e370535f68a279b484a993663b0de4fcb547.tar.gz redmine-e748e370535f68a279b484a993663b0de4fcb547.zip |
scm: cvs: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6277 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm')
-rw-r--r-- | lib/redmine/scm/adapters/cvs_adapter.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index f58df6638..9bcee71a6 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -376,13 +376,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 |