Merge branch 'dave-1426559693' of git://github.com/bahamas10/ohai into bahamas10-dave-1426559693

1 files changed, 8 insertions, 11 deletions

diff --git a/lib/ohai/plugins/joyent.rb b/lib/ohai/plugins/joyent.rb
index c921d65d..3ca3078d 100644
--- a/lib/ohai/plugins/joyent.rb
+++ b/lib/ohai/plugins/joyent.rb
@@ -25,21 +25,18 @@ Ohai.plugin(:Joyent) do
   depends "os", "platform", "virtualization"
 
   def collect_product_file
-    lines = []
-    if ::File.exists?("/etc/product")
-      ::File.open("/etc/product") do |file|
-        while line = file.gets
-          lines << line
-        end
-      end
+    data = ::File.read("/etc/product") rescue nil
+    if data
+      data.strip.split("\n")
+    else
+      nil
     end
-    lines
   end
 
   def collect_pkgsrc
-    if File.exist?("/opt/local/etc/pkg_install.conf")
-      sm_pkgsrc = ::File.read("/opt/local/etc/pkg_install.conf").split("=")
-      sm_pkgsrc[1].chomp
+    data = ::File.read("/opt/local/etc/pkg_install.conf") rescue nil
+    if data
+      data.strip.split("=", 2).last
     else
       nil
     end