Fixes logic to check python package installed

petems · petems · commit 5fe03a098c0f · 2015-03-18T18:19:00.000Z
diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb
@@ -26,12 +26,8 @@
 Facter.add("pip_version") do
   has_weight 50
   setcode do
-    begin
-      unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
-          /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-      end
-    rescue
-      false
+    unless [:absent,:purged].include?(pkg.retrieve[pkg.property(:ensure)])
+      pkg.retrieve[pkg.property(:ensure)]
     end
   end
 end
diff --git a/lib/facter/python_version.rb b/lib/facter/python_version.rb
@@ -16,12 +16,8 @@
 
 Facter.add("system_python_version") do
   setcode do
-    begin
-      unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
-          /^(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-      end
-    rescue
-      false
+    unless [:absent,:purged].include?(pkg.retrieve[pkg.property(:ensure)])
+      pkg.retrieve[pkg.property(:ensure)]
     end
   end
 end
@@ -38,12 +34,8 @@
 Facter.add("python_version") do
   has_weight 50
   setcode do
-    begin
-      unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
-          /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-      end
-    rescue
-      false
+    unless [:absent,:purged].include?(pkg.retrieve[pkg.property(:ensure)])
+      pkg.retrieve[pkg.property(:ensure)]
     end
   end
 end
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
@@ -26,12 +26,8 @@
 Facter.add("virtualenv_version") do
   has_weight 50
   setcode do
-    begin
-      unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
-          /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
-      end
-    rescue
-      false
+    unless [:absent,:purged].include?(pkg.retrieve[pkg.property(:ensure)])
+      pkg.retrieve[pkg.property(:ensure)]
     end
   end
 end
