diff options
| author | Mike McQuaid | 2015-09-14 09:06:16 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-09-14 09:07:12 +0100 |
| commit | 71198041c66e7544d31f80f3724691fa88179671 (patch) | |
| tree | 16cb6e7311a27b9a93e1574780f9c09a560677c2 /Library | |
| parent | 49dde3c5599a5463592428262aa63c05aff75221 (diff) | |
| download | brew-71198041c66e7544d31f80f3724691fa88179671.tar.bz2 | |
test-bot: fix handling hash/url arguments.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index ebee97261..84008ef21 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -188,17 +188,12 @@ module Homebrew 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 if $?.success? @hash = argument elsif url_match @url = url_match[0] - elsif formula + elsif safe_formulary(argument) @formulae = [argument] else raise ArgumentError.new("#{argument} is not a pull request URL, commit URL or formula name.") @@ -213,6 +208,11 @@ module Homebrew @hash == "HEAD" end + def safe_formulary(formula) + Formulary.factory formula + rescue FormulaUnavailableError, TapFormulaAmbiguityError + end + def git(*args) rd, wr = IO.pipe |
