components/puppet/patches/puppet-00-s12pkg.patch
author Danek Duvall <danek.duvall@oracle.com>
Fri, 03 Oct 2014 15:13:30 -0700
branchs11u2-sru
changeset 3382 b7084b0e8a61
parent 2928 43b3da52b84a
permissions -rw-r--r--
19078691 zsh version 5.0.5 needs a TPNO in the fullness of time
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2629
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
Add Solaris 12 to the pkg(5) pkg provider
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
2928
43b3da52b84a PSARC 2013/426 Puppet 3.4.1
Drew Fisher <drew.fisher@oracle.com>
parents: 2771
diff changeset
     3
--- puppet-3.4.1/lib/puppet/provider/package/pkg.rb.orig	2012-10-19 22:57:51.000000000 -0600
43b3da52b84a PSARC 2013/426 Puppet 3.4.1
Drew Fisher <drew.fisher@oracle.com>
parents: 2771
diff changeset
     4
+++ puppet-3.4.1/lib/puppet/provider/package/pkg.rb	2012-10-24 15:55:23.203830708 -0600
2629
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     5
@@ -23,7 +23,7 @@
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     6
 
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     7
   confine :osfamily => :solaris
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     8
 
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     9
-  defaultfor :osfamily => :solaris, :kernelrelease => '5.11'
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    10
+  defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    11
 
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    12
   def self.instances
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    13
     pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}