Merge pull request #7971 from sjackman/bottle-merge-cellar

bottle --merge: Fix bug with cellar :any
Homebrew · Jul 10, 2020 · a2b4797 · a2b4797
2 parents ead8768 + e2db288
commit a2b4797
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
@@ -446,10 +446,10 @@ def merge
             first
           elsif second.start_with?("/")
             second
-          elsif cellars.include?(:any)
-            :any
-          elsif cellars.include?(:any_skip_relocation)
-            :any_skip_relocation
+          elsif cellars.include?("any")
+            "any"
+          elsif cellars.include?("any_skip_relocation")
+            "any_skip_relocation"
           else
             second
           end