admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

pull: don't try to tap formulae.

Browse Source 
Unneeded now we're using canonical names.
This commit is contained in:
Mike McQuaid 2015-02-24 17:17:31 +00:00
parent da25d3e579
commit 4c19b5d913
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/pull.rb
View File

@ -93,7 +93,6 @@ module Homebrew
pull_url url pull_url url
changed_formulae = [] changed_formulae = []
changed_formulae_paths = []
if tap_dir if tap_dir
formula_dir = %w[Formula HomebrewFormula].find { |d| tap_dir.join(d).directory? } || "" formula_dir = %w[Formula HomebrewFormula].find { |d| tap_dir.join(d).directory? } || ""
@ -105,9 +104,7 @@ module Homebrew
"git", "diff-tree", "-r", "--name-only", "git", "diff-tree", "-r", "--name-only",
"--diff-filter=AM", revision, "HEAD", "--", formula_dir "--diff-filter=AM", revision, "HEAD", "--", formula_dir
).each_line do |line| ).each_line do |line|
line = line.chomp name = File.basename(line.chomp, ".rb")
name = File.basename(line, ".rb")
changed_formulae_paths << Pathname.new("#{formula_dir}/#{line}") if tap_dir
begin begin
changed_formulae << Formula[name] changed_formulae << Formula[name]
@ -117,8 +114,6 @@ module Homebrew
end end
end end
link_tap_formula(changed_formulae_paths, false)
unless ARGV.include? '--bottle' unless ARGV.include? '--bottle'
changed_formulae.each do |f| changed_formulae.each do |f|
next unless f.bottle next unless f.bottle