summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Callaway <mcallawa@genome.wustl.edu>2014-03-04 15:14:08 -0600
committerMatt Callaway <mcallawa@genome.wustl.edu>2014-03-04 15:14:08 -0600
commita29284170a6687669b00fbc574f1bdc5f9e5b404 (patch)
treebf554562a5510bb0ea0942f5ee2089d2c2adf26c
parent0277b9c81f5838dce9353a0a87a7029b7ebcf397 (diff)
Add begin/rescue/end to setcode block
This silences these warnings: Could not retrieve pip_version: undefined method `[]' for nil:NilClass Could not retrieve pip_version: can't convert Symbol into String
-rw-r--r--lib/facter/pip_version.rb14
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