[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 23a5b3db4f73e85c34dc917bc191f37b31910dcb
Author: Andreas Zuber <zuber at puzzle.ch>
Date:   Fri May 1 12:10:11 2009 +0200

    Fixed #2215 - Added support for SUSE Linux Enterprise Desktop to operatingsystem and operatingsystemrelease

diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
index eacc7b3..704b48f 100644
--- a/lib/facter/operatingsystem.rb
+++ b/lib/facter/operatingsystem.rb
@@ -39,6 +39,8 @@ Facter.add(:operatingsystem) do
             txt = File.read("/etc/SuSE-release")
             if txt =~ /^SUSE LINUX Enterprise Server/i
                 "SLES"
+            elsif txt =~ /^SUSE LINUX Enterprise Desktop/i
+                "SLED"
             elsif txt =~ /^openSUSE/i
                 "OpenSuSE"
             else
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
index 25a226d..d6e6e86 100644
--- a/lib/facter/operatingsystemrelease.rb
+++ b/lib/facter/operatingsystemrelease.rb
@@ -80,7 +80,7 @@ Facter.add(:operatingsystemrelease) do
 end
 
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{SLES OpenSuSE}
+    confine :operatingsystem => %w{SLES SLED OpenSuSE}
     setcode do
         releasefile = Facter::Util::Resolution.exec('cat /etc/SuSE-release')
         if releasefile =~ /^VERSION\s*=\s*(\d+)/

-- 
Packaging of Facter for debian