X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=lib%2Ffacter%2Fapt_updates.rb;h=e3b17d957e0a85a24f4f4782acf130de55a5d196;hb=06207c35da2c9ad20bc733abe43a8566b3506c28;hp=c2f38a8f73cae9dfb481db11b3bb4e22fbd69257;hpb=76a12dc6d700bbda754c75a3be49a19b7798ab0c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb index c2f38a8..e3b17d9 100644 --- a/lib/facter/apt_updates.rb +++ b/lib/facter/apt_updates.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + apt_package_updates = nil apt_dist_updates = nil @@ -11,7 +13,7 @@ def get_updates(upgrade_option) 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 = [ @@ -26,23 +28,27 @@ def get_updates(upgrade_option) end end end - - setcode do - if !apt_updates.nil? && apt_updates.length == 2 - apt_updates != [[], []] - end - end apt_updates end Facter.add('apt_has_updates') do confine osfamily: 'Debian' - apt_package_updates = get_updates('upgrade') + setcode do + apt_package_updates = get_updates('upgrade') + if !apt_package_updates.nil? && apt_package_updates.length == 2 + apt_package_updates != [[], []] + end + end end Facter.add('apt_has_dist_updates') do confine osfamily: 'Debian' - apt_dist_updates = get_updates('dist-upgrade') + setcode do + apt_dist_updates = get_updates('dist-upgrade') + if !apt_dist_updates.nil? && apt_dist_updates.length == 2 + apt_dist_updates != [[], []] + end + end end Facter.add('apt_package_updates') do