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

[Rein Henrichs]

The following commit has been merged in the upstream branch:
commit 67f6604e96f04f07fea1a452ae6a19f1d158405d
Author: Rein Henrichs <rein at puppetlabs.com>
Date:   Tue Aug 3 17:05:04 2010 -0700

    [#4062] Implement operating system facts for MeeGo
    
    Implements operatingsystem and operatingsystemrelease for MeeGo
    
    From Rohan McGovern's patch:
    
      MeeGo ( http://meego.com/ ) uses an /etc/meego-release file similar to
      the files found on many Linux distros.
    
      Currently, MeeGo falls back on “Linux” as the operatingsystem fact. It’d
      be useful to have a proper value. Attached patch implements it.
    
    Signed-off-by: Rein Henrichs <rein at puppetlabs.com>

diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
index d909fba..c5a3dc1 100644
--- a/lib/facter/operatingsystem.rb
+++ b/lib/facter/operatingsystem.rb
@@ -20,6 +20,8 @@ Facter.add(:operatingsystem) do
             "Mandriva"
         elsif FileTest.exists?("/etc/mandrake-release")
             "Mandrake"
+        elsif FileTest.exists?("/etc/meego-release")
+            "MeeGo"
         elsif FileTest.exists?("/etc/arch-release")
             "Archlinux"
         elsif FileTest.exists?("/etc/enterprise-release")
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
index 91f40a7..30f2989 100644
--- a/lib/facter/operatingsystemrelease.rb
+++ b/lib/facter/operatingsystemrelease.rb
@@ -1,11 +1,13 @@
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat}
+    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo}
     setcode do
         case Facter.value(:operatingsystem)
         when "CentOS", "RedHat"
             releasefile = "/etc/redhat-release"
         when "Fedora"
             releasefile = "/etc/fedora-release"
+        when "MeeGo"
+            releasefile = "/etc/meego-release"
         when "OEL"
             releasefile = "/etc/enterprise-release"
         when "OVS"

-- 
Packaging of Facter for debian