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 %r{^Inst\s}.match?(line)
+
package = line.gsub(%r{^Inst\s([^\s]+)\s.*}, '\1').strip
apt_updates[0].push(package)
security_matches = [
%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
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
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