lib/ohai/plugins/joyent.rb in ohai-16.5.6 vs lib/ohai/plugins/joyent.rb in ohai-16.6.5

- old
+ new

@@ -23,19 +23,19 @@ provides "joyent" provides "virtualization/guest_id" depends "os", "platform", "virtualization" def collect_product_file - data = ::File.read("/etc/product") rescue nil + data = file_read("/etc/product") rescue nil if data data.strip.split("\n") else [] end end def collect_pkgsrc - data = ::File.read("/opt/local/etc/pkg_install.conf") rescue nil + data = file_read("/opt/local/etc/pkg_install.conf") rescue nil if data /PKG_PATH=(.*)/.match(data)[1] rescue nil end end