author | Kristina Tripp <Kristina.Tripp@oracle.com> |
Fri, 07 Nov 2014 12:43:50 -0800 | |
branch | s11u2-sru |
changeset 3460 | 5c5af6e58474 |
parent 2928 | components/puppet/patches/puppet-00-s12pkg.patch@43b3da52b84a |
permissions | -rw-r--r-- |
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
1 |
Oracle customization - non upstream patch |
2629
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
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
|
3 |
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
4 |
--- puppet-3.6.2/lib/puppet/provider/package/pkg.rb.orig 2012-10-19 22:57:51.000000000 -0600 |
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
5 |
+++ puppet-3.6.2/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
|
6 |
@@ -23,7 +23,7 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
confine :osfamily => :solaris |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
- defaultfor :osfamily => :solaris, :kernelrelease => '5.11' |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+ 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
|
12 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
def self.instances |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))} |