diff options
| author | Martin Afanasjew | 2016-02-03 00:36:48 +0100 |
|---|---|---|
| committer | Martin Afanasjew | 2016-02-03 00:36:48 +0100 |
| commit | 5b89c33cac47cb01f63c0a3593ea48d22087802f (patch) | |
| tree | c1920d6cbf27af4987b35996eac0cbd1e877c40e | |
| parent | 18668ce24e3c84b1bb403850a124b43273778a4a (diff) | |
| download | brew-5b89c33cac47cb01f63c0a3593ea48d22087802f.tar.bz2 | |
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.
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 1454f9938..bb9023169 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] |