Merge pull request #62 from genome-vendor/master

Silence warnings when programs are not installed

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb
index 46c50d9..ce32f98 100644
--- a/lib/facter/pip_version.rb
+++ b/lib/facter/pip_version.rb
@@ -5,15 +5,23 @@ pkg = Puppet::Type.type(:package).new(:name => "python-pip")
 Facter.add("pip_version") do
   has_weight 100
   setcode do
-    /^pip (\d+\.\d+\.?\d*).*$/.match(Facter::Util::Resolution.exec('pip --version 2>/dev/null'))[1]
+    begin
+      /^pip (\d+\.\d+\.?\d*).*$/.match(Facter::Util::Resolution.exec('pip --version 2>/dev/null'))[1]
+    rescue
+      false
+    end
   end
 end
 
 Facter.add("pip_version") do
   has_weight 50
   setcode do
-    unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
-        /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+    begin
+      unless [:absent,'purged'].include?(pkg.retrieve[pkg.property(:ensure)])
+          /^.*(\d+\.\d+\.\d+).*$/.match(pkg.retrieve[pkg.property(:ensure)])[1]
+      end
+    rescue
+      false
     end
   end
 end