diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 09:50:41 +0100 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 09:50:41 +0100 |
| commit | 7726dc3f7d9fa45e94e748fe5679e89d96dd817f (patch) | |
| tree | 2ff474da68c73168035ee4633655a4639d0201cc | |
| parent | f8c2f1afa4a9ef71681a96b83b2abdc303a4b0bf (diff) | |
| download | puppet-7726dc3f7d9fa45e94e748fe5679e89d96dd817f.tar.gz puppet-7726dc3f7d9fa45e94e748fe5679e89d96dd817f.tar.xz puppet-7726dc3f7d9fa45e94e748fe5679e89d96dd817f.zip | |
(#4258) Permit variations of -nv in both pkgutil.conf files
| -rwxr-xr-x | lib/puppet/provider/package/pkgutil.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index 760ce01db..2661cedef 100755 --- a/lib/puppet/provider/package/pkgutil.rb +++ b/lib/puppet/provider/package/pkgutil.rb @@ -21,9 +21,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d Puppet.notice "See /var/opt/csw/pkgutil" end - pkgutilconf = File.open("/etc/opt/csw/pkgutil.conf") correct_wgetopts = false - pkgutilconf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*-nv/ } + [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath| + pkgutilconf = File.open(confpath) + pkgutilconf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } + end if ! correct_wgetopts Puppet.notice "It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf." end |