Merge pull request #60 from huit/el5_facts_error_message

prevent Facter error when packages not installed

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb
index bc725db..46c50d9 100644
--- a/lib/facter/pip_version.rb
+++ b/lib/facter/pip_version.rb
@@ -12,7 +12,7 @@ end
 Facter.add("pip_version") do
   has_weight 50
   setcode do
-    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+    unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
         /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
     end
   end
diff --git a/lib/facter/python_version.rb b/lib/facter/python_version.rb
index 50fef72..919fd89 100644
--- a/lib/facter/python_version.rb
+++ b/lib/facter/python_version.rb
@@ -5,7 +5,7 @@ pkg = Puppet::Type.type(:package).new(:name => "python")
 
 Facter.add("system_python_version") do
   setcode do
-    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+    unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
         /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
     end
   end
@@ -21,7 +21,7 @@ end
 Facter.add("python_version") do
   has_weight 50
   setcode do
-    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+    unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
         /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
     end
   end
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
index c923b09..9a3b4b0 100644
--- a/lib/facter/virtualenv_version.rb
+++ b/lib/facter/virtualenv_version.rb
@@ -12,7 +12,7 @@ end
 Facter.add("virtualenv_version") do
   has_weight 50
   setcode do
-    if pkg.retrieve[pkg.property(:ensure)] != 'purged'
+    unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
         /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
     end
   end