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

Merge pull request #12395 from Rylan12/fix-relocation-regex

Browse Source 
`Keg::Relocation`: allow `-F`, `-I`, `-L`, `-isystem` prefixes
This commit is contained in:
Rylan Polster 2021-11-08 20:39:41 -05:00 committed by GitHub
commit 0730fa74f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/keg_relocate.rb
View File

@ -12,7 +12,7 @@ class Keg
class Relocation class Relocation
extend T::Sig extend T::Sig
RELOCATABLE_PATH_REGEX_PREFIX = /(?<![a-zA-Z0-9])/.freeze RELOCATABLE_PATH_REGEX_PREFIX = /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))/.freeze
def initialize def initialize
@replacement_map = {} @replacement_map = {}

8
Library/Homebrew/test/keg_relocate/relocation_spec.rb
View File

@ -12,8 +12,8 @@ describe Keg::Relocation do
let(:cellar_placeholder) { "@@HOMEBREW_CELLAR@@" } let(:cellar_placeholder) { "@@HOMEBREW_CELLAR@@" }
let(:repository_placeholder) { "@@HOMEBREW_REPOSITORY@@" } let(:repository_placeholder) { "@@HOMEBREW_REPOSITORY@@" }
let(:library_placeholder) { "@@HOMEBREW_LIBRARY@@" } let(:library_placeholder) { "@@HOMEBREW_LIBRARY@@" }
let(:escaped_prefix) { /(?<![a-zA-Z0-9])#{Regexp.escape(HOMEBREW_PREFIX)}/o } let(:escaped_prefix) { /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))#{Regexp.escape(HOMEBREW_PREFIX)}/o }
let(:escaped_cellar) { /(?<![a-zA-Z0-9])#{HOMEBREW_CELLAR}/o } let(:escaped_cellar) { /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))#{HOMEBREW_CELLAR}/o }
def setup_relocation def setup_relocation
relocation = described_class.new relocation = described_class.new
@ -61,8 +61,8 @@ describe Keg::Relocation do
specify "::path_to_regex" do specify "::path_to_regex" do
expect(described_class.path_to_regex(prefix)).to eq escaped_prefix expect(described_class.path_to_regex(prefix)).to eq escaped_prefix
expect(described_class.path_to_regex("foo.bar")).to eq(/(?<![a-zA-Z0-9])foo\.bar/) expect(described_class.path_to_regex("foo.bar")).to eq(/(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))foo\.bar/)
expect(described_class.path_to_regex(/#{cellar}/o)).to eq escaped_cellar expect(described_class.path_to_regex(/#{cellar}/o)).to eq escaped_cellar
expect(described_class.path_to_regex(/foo.bar/)).to eq(/(?<![a-zA-Z0-9])foo.bar/) expect(described_class.path_to_regex(/foo.bar/)).to eq(/(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))foo.bar/)
end end
end end