diff options
| author | Mike McQuaid | 2014-11-23 14:38:40 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-11-23 14:38:40 +0000 |
| commit | ed30b04911a13a8b6cb507fb73ae82833a5c7558 (patch) | |
| tree | dc36b05698117a19e0f15c79397fc7261f4f5f1e /Library | |
| parent | 00f064410660463f00bcd58d1683e05ab9bfc83c (diff) | |
| download | brew-ed30b04911a13a8b6cb507fb73ae82833a5c7558.tar.bz2 | |
test-bot: fix tap-from-url regex usage.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 36b73b626..ebebd959a 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -549,8 +549,9 @@ module Homebrew git_url = ENV['UPSTREAM_GIT_URL'] || ENV['GIT_URL'] if !tap && git_url # Also can get tap from Jenkins GIT_URL. - /([\w-]+\/homebrew-[\w-]+)/ =~ git_url - tap = $1 + url_path = git_url.gsub(%r{^https?://github\.com/}, "").gsub(%r{/$}, "") + HOMEBREW_TAP_ARGS_REGEX =~ url_path + tap = "#{$1}/#{$3}" if $1 && $3 end if Pathname.pwd == HOMEBREW_PREFIX and ARGV.include? "--cleanup" |
