From cff79348c91cc9060eab33840b18a8a54c51fbf4 Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Mon, 27 Jul 2020 17:50:38 +0530 Subject: [PATCH] dev-cmd/bump-formula-pr.rb: fix StringInreplaceExtension usage --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index f00a3c0ec1..f70c846d1a 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -445,8 +445,8 @@ module Homebrew def inreplace_pairs(path, replacement_pairs) if args.dry_run? - contents = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read } - contents.extend(StringInreplaceExtension) + str = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read } + contents = StringInreplaceExtension.new(str) replacement_pairs.each do |old, new| 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 @@ -455,8 +455,8 @@ module Homebrew end raise Utils::InreplaceError, path => contents.errors unless contents.errors.empty? - path.atomic_write(contents) if args.write? - contents + path.atomic_write(contents.inreplace_string) if args.write? + contents.inreplace_string else Utils::Inreplace.inreplace(path) do |s| replacement_pairs.each do |old, new|