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

pull: skip non-ruby files when collecting formulae names

Browse Source 
Closes #377.

Signed-off-by: Baptiste Fontaine <b@ptistefontaine.fr>
This commit is contained in:
Baptiste Fontaine 2016-06-17 21:42:43 +02:00
parent cad85754cf
commit af94c4fc50
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,13 +113,9 @@ module Homebrew
"git", "diff-tree", "-r", "--name-only", "git", "diff-tree", "-r", "--name-only",
"--diff-filter=AM", orig_revision, "HEAD", "--", tap.formula_dir.to_s "--diff-filter=AM", orig_revision, "HEAD", "--", tap.formula_dir.to_s
).each_line do |line| ).each_line do |line|
next unless line.end_with? ".rb\n"
name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}" name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
begin changed_formulae_names << name
changed_formulae_names << name
# Make sure we catch syntax errors.
rescue Exception
next
end
end end
end end
@ -127,7 +123,13 @@ module Homebrew
changed_formulae_names.each do |name| changed_formulae_names.each do |name|
next if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] next if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"]
f = Formula[name] begin
f = Formula[name]
# Make sure we catch syntax errors.
rescue Exception
next
end
if ARGV.include? "--bottle" if ARGV.include? "--bottle"
if f.bottle_unneeded? if f.bottle_unneeded?
ohai "#{f}: skipping unneeded bottle." ohai "#{f}: skipping unneeded bottle."