inreplace: also warn on plain gsub! usage
This commit is contained in:
parent
a3edec8b88
commit
42d44053ef
@ -13,11 +13,20 @@ end
|
|||||||
|
|
||||||
# used by the inreplace function (in utils.rb)
|
# used by the inreplace function (in utils.rb)
|
||||||
module StringInreplaceExtension
|
module StringInreplaceExtension
|
||||||
|
# Warn if nothing was replaced
|
||||||
|
def gsub! before, after, audit_result=true
|
||||||
|
sub = super(before, after)
|
||||||
|
if audit_result and sub.nil?
|
||||||
|
opoo "inreplace: replacement of '#{before}' with '#{after}' failed"
|
||||||
|
end
|
||||||
|
return sub
|
||||||
|
end
|
||||||
|
|
||||||
# Looks for Makefile style variable defintions and replaces the
|
# Looks for Makefile style variable defintions and replaces the
|
||||||
# value with "new_value", or removes the definition entirely.
|
# value with "new_value", or removes the definition entirely.
|
||||||
def change_make_var! flag, new_value
|
def change_make_var! flag, new_value
|
||||||
new_value = "#{flag}=#{new_value}"
|
new_value = "#{flag}=#{new_value}"
|
||||||
sub = gsub! Regexp.new("^#{flag}[ \\t]*=[ \\t]*(.*)$"), new_value
|
sub = gsub! Regexp.new("^#{flag}[ \\t]*=[ \\t]*(.*)$"), new_value, false
|
||||||
opoo "inreplace: changing '#{flag}' to '#{new_value}' failed" if sub.nil?
|
opoo "inreplace: changing '#{flag}' to '#{new_value}' failed" if sub.nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -27,7 +36,7 @@ module StringInreplaceExtension
|
|||||||
flags = [flags] unless flags.kind_of? Array
|
flags = [flags] unless flags.kind_of? Array
|
||||||
flags.each do |flag|
|
flags.each do |flag|
|
||||||
# Also remove trailing \n, if present.
|
# Also remove trailing \n, if present.
|
||||||
sub = gsub! Regexp.new("^#{flag}[ \\t]*=(.*)$\n?"), ""
|
sub = gsub! Regexp.new("^#{flag}[ \\t]*=(.*)$\n?"), "", false
|
||||||
opoo "inreplace: removing '#{flag}' failed" if sub.nil?
|
opoo "inreplace: removing '#{flag}' failed" if sub.nil?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user