diff options
| author | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-02-26 12:08:28 -0500 |
|---|---|---|
| committer | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-02-26 12:08:28 -0500 |
| commit | 0277b9c81f5838dce9353a0a87a7029b7ebcf397 (patch) | |
| tree | 40d58ec536294665851d6068e7b34c2259f965c9 /lib/facter/python_version.rb | |
| parent | 2bb37cdbc62868f11de93c93853eea03bda513fd (diff) | |
| parent | cc60884faa51751a7c2f07d94bec192fb57b76b3 (diff) | |
Merge pull request #60 from huit/el5_facts_error_message
prevent Facter error when packages not installed
Diffstat (limited to 'lib/facter/python_version.rb')
| -rw-r--r-- | lib/facter/python_version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |