From 72d13106361c1dda00ea520638080b80cdefad43 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 27 Sep 2013 17:54:01 +0100 Subject: [PATCH] brew-pull/test-bot: use stricter formula match. --- Library/Contributions/cmd/brew-pull.rb | 2 +- Library/Contributions/cmd/brew-test-bot.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb index 521df766b6..de368f9fb5 100755 --- a/Library/Contributions/cmd/brew-pull.rb +++ b/Library/Contributions/cmd/brew-pull.rb @@ -78,7 +78,7 @@ ARGV.named.each do|arg| `git diff #{revision}.. --name-status`.each_line do |line| status, filename = line.split # Don't try and do anything to removed files. - if (status == 'A' or status == 'M') and filename.include? '/Formula/' or tap url + if (status == 'A' or status == 'M') and filename.match /Formula\/\w+\.rb$/ or tap url formula = File.basename(filename, '.rb') ohai "Installing #{formula}" install = Formula.factory(formula).installed? ? 'upgrade' : 'install' diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index fb21b5eceb..f035eddefd 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -230,7 +230,7 @@ class Test status, filename = line.split # Don't try and do anything to removed files. if (status == 'A' or status == 'M') - if filename.include? '/Formula/' + if filename.match /Formula\/\w+\.rb$/ @formulae << File.basename(filename, '.rb') end end