summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:33:24 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-07-15 16:33:24 +0000
commite10198f0d5f3f0b7ba2f95a1fa1ae16abe89fb0d (patch)
treeeda648f10bccf101f332807fabf19fe1561095ac /lib/redmine/scm
parent4dea2870b7d0928b0b8a073c44131cbbff707c1b (diff)
downloadredmine-e10198f0d5f3f0b7ba2f95a1fa1ae16abe89fb0d.tar.gz
redmine-e10198f0d5f3f0b7ba2f95a1fa1ae16abe89fb0d.zip
scm: bazaar: use self.class.sq_bin for command name at adpter scm_cmd_no_raise() (#8825).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6284 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 a4a313577..5e8faff95 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -292,9 +292,12 @@ module Redmine
private :scm_cmd
def scm_cmd_no_raise(*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
+ )
ret
end
private :scm_cmd_no_raise