From: Go MAEDA <maeda@farend.jp>
Date: Wed, 20 Mar 2019 15:02:35 +0000 (+0000)
Subject: Fix FrozenError in BazaarAdapter.branch_conf_path (#26561).
X-Git-Tag: 4.1.0~1022
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21769bb59ec7e89a63441c6b83d9a8d5cde78676;p=redmine.git

Fix FrozenError in BazaarAdapter.branch_conf_path (#26561).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17994 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index cce165321..09e840a37 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -248,18 +248,11 @@ module Redmine
         end
 
         def self.branch_conf_path(path)
-          bcp = nil
+          return unless path
           m = path.match(%r{^(.*[/\\])\.bzr.*$})
-          if m
-            bcp = m[1]
-          else
-            bcp = path
-          end
+          bcp = m ? m[1] : path.dup
           bcp.gsub!(%r{[\/\\]$}, "")
-          if bcp
-            bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
-          end
-          bcp
+          File.join(bcp, ".bzr", "branch", "branch.conf")
         end
 
         def append_revisions_only