summaryrefslogtreecommitdiff
path: root/lib/puppet/provider/file_line
diff options
context:
space:
mode:
authorGeoff Williams <GeoffWilliams@users.noreply.github.com>2017-03-14 01:24:36 +1100
committerPaula McMaw <paula@puppet.com>2017-03-13 14:24:36 +0000
commit46e3a2349e9eef4001db8be9581fae9dfbccaf14 (patch)
tree999af0329383b541ec2cd782cdaa47ede5f32791 /lib/puppet/provider/file_line
parent70d071ba6fa3cf611e5dbdc1cba1343255edf978 (diff)
(#FM-6068) allow file encoding to be specified (#726)
* (#FM-6068) allow file encoding to be specified Add a new parameter `encoding` to allow non UTF-8 files to specify a file encoding. This prevents receiving the error message "invalid byte sequence in UTF-8" when special characters that are not UTF-8 encoded appear in the input stream, such as the copyright symbol. * (#FM-6068) allow file encoding to be specified Added docs and tests as requested
Diffstat (limited to 'lib/puppet/provider/file_line')
-rw-r--r--lib/puppet/provider/file_line/ruby.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index beeb430..fbf7d8e 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -40,7 +40,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
# file; for now assuming that this type is only used on
# small-ish config files that can fit into memory without
# too much trouble.
- @lines ||= File.readlines(resource[:path])
+ @lines ||= File.readlines(resource[:path], :encoding => resource[:encoding])
end
def match_regex