From 3671c9fce6cd6bbedf206f9c1c3611468b7887da Mon Sep 17 00:00:00 2001
From: Rein Henrichs <rein@puppetlabs.com>
Date: Tue, 24 Aug 2010 14:22:35 -0700
Subject: [PATCH] [#4583] Refactor uptime to use Resolution.exec

Resolution.exec used to ensure that any shell errors are suppressed.
---
 lib/facter/util/uptime.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/facter/util/uptime.rb b/lib/facter/util/uptime.rb
index 6c60aceec7..9a59d303b2 100644
--- a/lib/facter/util/uptime.rb
+++ b/lib/facter/util/uptime.rb
@@ -19,19 +19,19 @@ def self.get_uptime_seconds_win
     private
 
     def self.uptime_proc_uptime
-        if output = `/bin/cat #{uptime_file} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("/bin/cat #{uptime_file} 2>/dev/null")
             output.chomp.split(" ").first.to_i
         end
     end
 
     def self.uptime_sysctl
-        if output = `#{uptime_sysctl_cmd} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
             compute_uptime(Time.at(output.unpack('L').first))
         end
     end
 
     def self.uptime_who_dash_b
-        if output = `#{uptime_who_cmd} 2>/dev/null` and $?.success?
+        if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
             compute_uptime(Time.parse(output))
         end
     end