Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / facter / pe_version.rb

diff --git a/3rdparty/modules/stdlib/lib/facter/pe_version.rb b/3rdparty/modules/stdlib/lib/facter/pe_version.rb
index 0cc0f64..d011855 100644 (file)
--- a/3rdparty/modules/stdlib/lib/facter/pe_version.rb
+++ b/3rdparty/modules/stdlib/lib/facter/pe_version.rb
@@ -8,16 +8,23 @@
 #
 # Caveats:
 #
-Facter.add("pe_version") do
+# Fact: pe_version
+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(%r{Puppet Enterprise (\d+\.\d+\.\d+)})
+      pe_ver[1] if pe_ver
+    else
+      nil
+    end
   end
 end
 
-Facter.add("is_pe") do
+# Fact: is_pe
+Facter.add('is_pe') do
   setcode do
-    if Facter.value(:pe_version).to_s.empty? then
+    if Facter.value(:pe_version).to_s.empty?
       false
     else
       true
@@ -25,28 +32,34 @@ Facter.add("is_pe") do
   end
 end
 
-Facter.add("pe_major_version") do
+# Fact: pe_major_version
+Facter.add('pe_major_version') do
   confine :is_pe => true
   setcode do
-    if pe_version = Facter.value(:pe_version)
+    pe_version = Facter.value(:pe_version)
+    if pe_version
       pe_version.to_s.split('.')[0]
     end
   end
 end
 
-Facter.add("pe_minor_version") do
+# Fact: pe_minor_version
+Facter.add('pe_minor_version') do
   confine :is_pe => true
   setcode do
-    if pe_version = Facter.value(:pe_version)
+    pe_version = Facter.value(:pe_version)
+    if pe_version
       pe_version.to_s.split('.')[1]
     end
   end
 end
 
-Facter.add("pe_patch_version") do
+# Fact: pe_patch_version
+Facter.add('pe_patch_version') do
   confine :is_pe => true
   setcode do
-    if pe_version = Facter.value(:pe_version)
+    pe_version = Facter.value(:pe_version)
+    if pe_version
       pe_version.to_s.split('.')[2]
     end
   end