components/puppet/patches/puppet-00-s12pkg.patch
author Drew Fisher <drew.fisher@oracle.com>
Tue, 21 May 2013 09:30:36 -0600
branchs11-update
changeset 2629 3666f503c6e7
child 1409 9db4ba32e740
child 2771 8e4227dc2fc4
permissions -rw-r--r--
PSARC/2013/005 Puppet 3.0.1 15846284 Integrate the Puppet CM 16479671 problem in UTILITY/PUPPET 16480077 Update Puppet to 3.1.1
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
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
--- puppet-3.0.1/lib/puppet/provider/package/pkg.rb.orig	2012-10-19 22:57:51.000000000 -0600
3666f503c6e7 PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
+++ puppet-3.0.1/lib/puppet/provider/package/pkg.rb	2012-10-24 15:55:23.203830708 -0600
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))}