X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Fpe_version.rb;h=d01185580930559b8a32f4d7ea119ea515b8f066;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=c9f2181c0d1c3b5d506ab6afe1fc9f8aab508d44;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/facter/pe_version.rb b/3rdparty/modules/stdlib/lib/facter/pe_version.rb
index c9f2181c0..d01185580 100644
--- a/3rdparty/modules/stdlib/lib/facter/pe_version.rb
+++ b/3rdparty/modules/stdlib/lib/facter/pe_version.rb
@@ -8,11 +8,12 @@
 #
 # Caveats:
 #
-Facter.add("pe_version") do
+# Fact: pe_version
+Facter.add('pe_version') do
   setcode do
-    puppet_ver = Facter.value("puppetversion")
-    if puppet_ver != nil
-      pe_ver = puppet_ver.match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
+    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
@@ -20,9 +21,10 @@ Facter.add("pe_version") do
   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
@@ -30,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