From 5b89c33cac47cb01f63c0a3593ea48d22087802f Mon Sep 17 00:00:00 2001 From: Martin Afanasjew Date: Wed, 3 Feb 2016 00:36:48 +0100 Subject: [PATCH] pull: fix ambiguity issues for tap migrations `Formula[name]` gets called with an unqualified name and thus will throw `TapFormulaAmbiguityError` exceptions (silently ignored) if both the old and the new tap are present and changes for the new tap are pulled before the migrated formulae are removed from the old tap. The result is an empty or incomplete `changed_formulae`, causing issues with pulling the corresponding bottles and possibly other problems, too. --- Library/Homebrew/cmd/pull.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 1454f99383..bb9023169e 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -100,7 +100,7 @@ module Homebrew "git", "diff-tree", "-r", "--name-only", "--diff-filter=AM", revision, "HEAD", "--", tap.formula_dir.to_s ).each_line do |line| - name = File.basename(line.chomp, ".rb") + name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}" begin changed_formulae << Formula[name]