Merge pull request #943 from MikeMcQuaid/test-bot-multiline-regex

test-bot: fix multiline regex.
This commit is contained in:
Mike McQuaid 2016-09-12 10:46:59 +01:00 committed by GitHub
commit afc5aa125f

View File

@ -631,7 +631,7 @@ module Homebrew
bottle_step = steps.last
if bottle_step.passed? && bottle_step.output?
bottle_filename =
bottle_step.output.gsub(%r{.*(\./\S+#{Utils::Bottles.native_regex}).*/m}, '\1')
bottle_step.output.gsub(%r{.*(\./\S+#{Utils::Bottles.native_regex}).*}m, '\1')
bottle_json_filename = bottle_filename.gsub(/\.(\d+\.)?tar\.gz$/, ".json")
bottle_merge_args = ["--merge", "--write", "--no-commit", bottle_json_filename]
bottle_merge_args << "--keep-old" if ARGV.include? "--keep-old"