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

Merge pull request #8101 from vidusheeamoli/fix-StringInreplaceExtension-usage

Browse Source 
dev-cmd/bump-formula-pr.rb: fix StringInreplaceExtension usage
This commit is contained in:
Mike McQuaid 2020-07-27 16:07:09 +01:00 committed by GitHub
commit 97cf1750f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -445,8 +445,8 @@ module Homebrew
def inreplace_pairs(path, replacement_pairs) def inreplace_pairs(path, replacement_pairs)
if args.dry_run? if args.dry_run?
contents = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read } str = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read }
contents.extend(StringInreplaceExtension) contents = StringInreplaceExtension.new(str)
replacement_pairs.each do |old, new| replacement_pairs.each do |old, new|
ohai "replace #{old.inspect} with #{new.inspect}" unless args.quiet? ohai "replace #{old.inspect} with #{new.inspect}" unless args.quiet?
raise "No old value for new value #{new}! Did you pass the wrong arguments?" unless old raise "No old value for new value #{new}! Did you pass the wrong arguments?" unless old
@ -455,8 +455,8 @@ module Homebrew
end end
raise Utils::InreplaceError, path => contents.errors unless contents.errors.empty? raise Utils::InreplaceError, path => contents.errors unless contents.errors.empty?
path.atomic_write(contents) if args.write? path.atomic_write(contents.inreplace_string) if args.write?
contents contents.inreplace_string
else else
Utils::Inreplace.inreplace(path) do |s| Utils::Inreplace.inreplace(path) do |s|
replacement_pairs.each do |old, new| replacement_pairs.each do |old, new|