X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=lib%2Ffacter%2Fapt_updates.rb;h=66c6a892867be4b15161f41cc84aad3ea9ca0510;hb=refs%2Fheads%2Frelease-prep;hp=c980da0a77071d24cc311c17672e159cc7be42ef;hpb=ef0d4e7337a535a25d76b73aebf6bfdda975f533;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
index c980da0..66c6a89 100644
--- a/lib/facter/apt_updates.rb
+++ b/lib/facter/apt_updates.rb
@@ -9,11 +9,12 @@ apt_dist_updates = nil
 def get_updates(upgrade_option)
   apt_updates = nil
   if File.executable?('/usr/bin/apt-get')
-    apt_get_result = Facter::Util::Resolution.exec("/usr/bin/apt-get -s -o Debug::NoLocking=true #{upgrade_option} 2>&1")
+    apt_get_result = Facter::Core::Execution.execute("/usr/bin/apt-get -s -o Debug::NoLocking=true #{upgrade_option} 2>&1")
     unless apt_get_result.nil?
       apt_updates = [[], []]
       apt_get_result.each_line do |line|
-        next unless line =~ %r{^Inst\s}
+        next unless %r{^Inst\s}.match?(line)
+
         package = line.gsub(%r{^Inst\s([^\s]+)\s.*}, '\1').strip
         apt_updates[0].push(package)
         security_matches = [
@@ -22,9 +23,7 @@ def get_updates(upgrade_option)
           %r{ gNewSense[^\s]+-security[, ]},
         ]
         re = Regexp.union(security_matches)
-        if line.match(re)
-          apt_updates[1].push(package)
-        end
+        apt_updates[1].push(package) if line.match(re)
       end
     end
   end
@@ -35,9 +34,7 @@ Facter.add('apt_has_updates') do
   confine osfamily: 'Debian'
   setcode do
     apt_package_updates = get_updates('upgrade')
-    if !apt_package_updates.nil? && apt_package_updates.length == 2
-      apt_package_updates != [[], []]
-    end
+    apt_package_updates != [[], []] if !apt_package_updates.nil? && apt_package_updates.length == 2
   end
 end
 
@@ -45,9 +42,7 @@ Facter.add('apt_has_dist_updates') do
   confine osfamily: 'Debian'
   setcode do
     apt_dist_updates = get_updates('dist-upgrade')
-    if !apt_dist_updates.nil? && apt_dist_updates.length == 2
-      apt_dist_updates != [[], []]
-    end
+    apt_dist_updates != [[], []] if !apt_dist_updates.nil? && apt_dist_updates.length == 2
   end
 end