vendored/puppet/lib/puppet/provider/service/base.rb in bolt-0.21.1 vs vendored/puppet/lib/puppet/provider/service/base.rb in bolt-0.21.2
- old
+ new
@@ -44,10 +44,10 @@
# of our regular expression.
table = Puppet::Util::CharacterEncoding.convert_to_utf_8(table)
# If that fails, force to UTF-8 and then scrub as most uses are scanning
# for ACII-compatible program names.
table.force_encoding(Encoding::UTF_8) unless table.encoding == Encoding::UTF_8
- table = Puppet::Util::CharacterEncoding.scrub(table) unless table.valid_encoding?
+ table = table.scrub unless table.valid_encoding?
table.each_line { |line|
if regex.match(line)
self.debug "Process matched: #{line}"
ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)