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=f261d2c16540a7bcc4e873c51dec618eafe92511;hpb=1442e42b3591b50887351a50b7a4bef2b16038ab;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb index f261d2c..66c6a89 100644 --- a/lib/facter/apt_updates.rb +++ b/lib/facter/apt_updates.rb @@ -14,6 +14,7 @@ def get_updates(upgrade_option) apt_updates = [[], []] apt_get_result.each_line do |line| 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