components/ruby/puppet/patches/puppet-00-PUP-6793-s12pkg.patch
changeset 7565 48aa82a0931f
equal deleted inserted replaced
7564:f958607559a6 7565:48aa82a0931f
       
     1 Merged with upstream PUP 4.9.0
       
     2 (PUP-6793) pkg provider should be default for Solaris 12
       
     3 https://tickets.puppetlabs.com/browse/PUP-6793
       
     4 
       
     5 diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
       
     6 --- a/lib/puppet/provider/package/pkg.rb
       
     7 +++ b/lib/puppet/provider/package/pkg.rb
       
     8 @@ -23,7 +23,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       
     9  
       
    10    confine :osfamily => :solaris
       
    11  
       
    12 -  defaultfor :osfamily => :solaris, :kernelrelease => '5.11'
       
    13 +  defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
       
    14  
       
    15    def self.instances
       
    16      pkg(:list, '-Hv').split("\n").map{|l| new(parse_line(l))}