equal
deleted
inserted
replaced
1 Oracle customization - non upstream patch |
1 Oracle customization - non upstream patch |
2 Add Solaris 12 to the pkg(5) pkg provider |
2 Add Solaris 12 to the pkg(5) pkg provider |
3 |
3 |
4 --- puppet-3.6.2/lib/puppet/provider/package/pkg.rb.orig 2012-10-19 22:57:51.000000000 -0600 |
4 --- puppet-3.8.6/lib/puppet/provider/package/pkg.rb.orig 2016-04-19 13:58:08.682627507 -0700 |
5 +++ puppet-3.6.2/lib/puppet/provider/package/pkg.rb 2012-10-24 15:55:23.203830708 -0600 |
5 +++ puppet-3.8.6/lib/puppet/provider/package/pkg.rb 2016-04-19 14:01:27.178984250 -0700 |
6 @@ -23,7 +23,7 @@ |
6 @@ -1,3 +1,7 @@ |
|
7 +####################################################################### |
|
8 +# Oracle has modified the originally distributed contents of this file. |
|
9 +####################################################################### |
|
10 + |
|
11 require 'puppet/provider/package' |
|
12 |
|
13 Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do |
|
14 @@ -23,7 +27,7 @@ |
7 |
15 |
8 confine :osfamily => :solaris |
16 confine :osfamily => :solaris |
9 |
17 |
10 - defaultfor :osfamily => :solaris, :kernelrelease => '5.11' |
18 - defaultfor :osfamily => :solaris, :kernelrelease => '5.11' |
11 + defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12'] |
19 + defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12'] |
12 |
20 |
13 def self.instances |
21 def self.instances |
14 pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))} |
22 pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))} |
|
23 |