Merge remote-tracking branch 'upstream/master' into 1.7.x-merge

[puppet-modules/puppetlabs-apt.git] / lib / facter / apt_updates.rb

diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
index ee177380c231939a12f0d22fd33dbacd4acd3f0c..77e667e6d76c18f8f2eed5adc3b2dad187035c32 100644 (file)
--- a/lib/facter/apt_updates.rb
+++ b/lib/facter/apt_updates.rb
@@ -1,9 +1,37 @@
-Facter.add("apt_updates") do
+apt_package_updates = nil
+Facter.add("apt_has_updates") do
   confine :osfamily => 'Debian'
+  if File.executable?("/usr/lib/update-notifier/apt-check")
+    apt_package_updates = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check 2>/dev/null').split(';')
+  end
+
+  setcode do
+    apt_package_updates != ['0', '0'] unless apt_package_updates.nil?
+  end
+end
+
+Facter.add("apt_package_updates") do
+  confine :apt_has_updates => true
   setcode do
-    if File.executable?("/usr/lib/update-notifier/apt-check")
-      updates = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check 2>&1')
-      Integer(updates.strip.split(';')[0])
+    packages = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check -p 2>/dev/null').split("\n")
+    if Facter.version < '2.0.0'
+      packages.join(',')
+    else
+      packages
     end
   end
 end
+
+Facter.add("apt_updates") do
+  confine :apt_has_updates => true
+  setcode do
+    Integer(apt_package_updates[0])
+  end
+end
+
+Facter.add("apt_security_updates") do
+  confine :apt_has_updates => true
+  setcode do
+    Integer(apt_package_updates[1])
+  end
+end