diff options
| author | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
| commit | 066c08f8362d53f0f30897cb8710d11260c726ea (patch) | |
| tree | a6369eecd88bb731fe413d0bbc8af73d74d1f447 /lib/facter/pe_version.rb | |
| parent | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff) | |
| parent | b65dd1f45d10e10e45455358aeabb29167990e2c (diff) | |
Merge remote-tracking branch 'origin/master' into leap_master
Diffstat (limited to 'lib/facter/pe_version.rb')
| -rw-r--r-- | lib/facter/pe_version.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb index 0cc0f64..c9f2181 100644 --- a/lib/facter/pe_version.rb +++ b/lib/facter/pe_version.rb @@ -10,8 +10,13 @@ # Facter.add("pe_version") do setcode do - pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/) - pe_ver[1] if pe_ver + puppet_ver = Facter.value("puppetversion") + if puppet_ver != nil + pe_ver = puppet_ver.match(/Puppet Enterprise (\d+\.\d+\.\d+)/) + pe_ver[1] if pe_ver + else + nil + end end end |