Make up2date the default for RHEL <= 4, and confine it to RHEL; make yum the default for RHEL >= 5. Fixes trac #478

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2233 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index c11be0947..c195e18fb 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -3,7 +3,9 @@ Puppet.type(:package).provide :up2date, :parent => :rpm do
         mechanism."
 
     commands :up2date => "/usr/sbin/up2date-nox"
-    defaultfor :operatingsystem => :redhat
+    defaultfor :operatingsystem => :redhat, 
+               :lsbdistrelease => ["2.1", "3", "4"]
+    confine    :operatingsystem => :redhat
 
     # Install a package using 'up2date'.
     def install
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
index f0a3cff6d..7894439c2 100755
--- a/lib/puppet/provider/package/yum.rb
+++ b/lib/puppet/provider/package/yum.rb
@@ -2,7 +2,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm do
     desc "Support via ``yum``."
     commands :yum => "yum", :rpm => "rpm"
 
-    defaultfor :operatingsystem => [:fedora, :centos]
+    defaultfor :operatingsystem => [:fedora, :centos, :redhat]
 
     # Install a package using 'yum'.
     def install