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

test-bot: fix handling hash/url arguments.

Browse Source
This commit is contained in:
Mike McQuaid 2015-09-14 09:06:16 +01:00
parent 49dde3c559
commit 71198041c6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/test-bot.rb
View File

@ -188,17 +188,12 @@ module Homebrew
url_match = argument.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX url_match = argument.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
begin
formula = Formulary.factory(argument)
rescue FormulaUnavailableError, TapFormulaAmbiguityError
end
git "rev-parse", "--verify", "-q", argument git "rev-parse", "--verify", "-q", argument
if $?.success? if $?.success?
@hash = argument @hash = argument
elsif url_match elsif url_match
@url = url_match[0] @url = url_match[0]
elsif formula elsif safe_formulary(argument)
@formulae = [argument] @formulae = [argument]
else else
raise ArgumentError.new("#{argument} is not a pull request URL, commit URL or formula name.") raise ArgumentError.new("#{argument} is not a pull request URL, commit URL or formula name.")
@ -213,6 +208,11 @@ module Homebrew
@hash == "HEAD" @hash == "HEAD"
end end
def safe_formulary(formula)
Formulary.factory formula
rescue FormulaUnavailableError, TapFormulaAmbiguityError
end
def git(*args) def git(*args)
rd, wr = IO.pipe rd, wr = IO.pipe