[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 99de9208333531d0ad09d266a76d44face71de94
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Oct 1 01:42:00 2008 +1000

    Fixed #1620 - Add 'sles' to Puppet confines when 'suse' is used

diff --git a/CHANGELOG b/CHANGELOG
index 7ffe429..4511e49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixed #1620 - Add 'sles' to Puppet confines when 'suse' is used
+
     Fixed #1585 - Allow complex 'if' and variable expressions
 
     Fixed #1564 - Saving File#checksum to state.yaml broken
diff --git a/lib/puppet/provider/package/rug.rb b/lib/puppet/provider/package/rug.rb
index c5451ad..1e1d676 100644
--- a/lib/puppet/provider/package/rug.rb
+++ b/lib/puppet/provider/package/rug.rb
@@ -5,8 +5,8 @@ Puppet.type(:package).provide :rug, :parent => :rpm do
 
     commands :rug => "/usr/bin/rug"
     commands :rpm => "rpm"
-    defaultfor :operatingsystem => :suse 
-    confine    :operatingsystem => :suse
+    defaultfor :operatingsystem => [:suse, :sles]
+    confine    :operatingsystem => [:suse, :sles]
 
     # Install a package using 'rug'.
     def install
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index d26f76e..faa7547 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -6,7 +6,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
 
     commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
  
-    defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos]
+    defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles]
 
     def self.defpath
         superclass.defpath

-- 
Puppet packaging for Debian