summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:33:02 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:33:02 +0000
commit4dea2870b7d0928b0b8a073c44131cbbff707c1b (patch)
tree705135b727b3aa6c18a2afbaf8d23ed7cb0e7ec2 /lib/redmine/scm
parent9b66e09e7f317dd4ff7e5ab2ab3714dc190fef2b (diff)
downloadredmine-4dea2870b7d0928b0b8a073c44131cbbff707c1b.tar.gz
redmine-4dea2870b7d0928b0b8a073c44131cbbff707c1b.zip
scm: bazaar: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6283 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm')
-rw-r--r--lib/redmine/scm/adapters/bazaar_adapter.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 62e3b2569..a4a313577 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -278,9 +278,12 @@ module Redmine
end
def scm_cmd(*args, &block)
- full_args = [BZR_BIN]
+ full_args = []
full_args += args
- ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
+ ret = shellout(
+ self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '),
+ &block
+ )
if $? && $?.exitstatus != 0
raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}"
end