X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Flib%2Ffacter%2Fsoftware.rb;h=58318fe48de1feec4b1bb53af06e5f17a76516bd;hb=1b40c402500f4a7df439bf2c6b0bab5084f5e676;hp=47fa46a81429f60988f31368071db859416960e8;hpb=7c3fe4776228ba99546a7d94652febe6c207231d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 47fa46a81..58318fe48 100644
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -154,6 +154,11 @@ Facter.add("systemd") do
 end
 Facter.add("tor_ge_0_2_9") do
 	setcode do
-		system(%{dpkg -l tor >/dev/null 2>&1 && dpkg --compare-versions $(dpkg-query -W -f='${Version}' tor) ge 0.2.9})
+		system(%{test -n "$(dpkg-query -W -f='${Version}' tor 2>/dev/null)" && dpkg --compare-versions "$(dpkg-query -W -f='${Version}' tor)" ge 0.2.9})
+	end
+end
+Facter.add("haveged") do
+	setcode do
+		FileTest.exist?("/usr/sbin/haveged")
 	end
 end