From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 15 Jul 2011 16:33:02 +0000 (+0000)
Subject: scm: bazaar: use self.class.sq_bin for command name at adpter scm_cmd() (#8825).
X-Git-Tag: 1.3.0~1650
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4dea2870b7d0928b0b8a073c44131cbbff707c1b;p=redmine.git

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

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