summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJuerg Walz <jwalz@pobox.com>2011-04-05 10:35:42 +0800
committerDominic Cleal <dcleal@redhat.com>2011-04-13 09:04:47 +0100
commitef86105215a00f428e9cdc251b6a29b8e11487bb (patch)
tree78f6d430cd6ebc41de8d855f81d1ab68d87a1f78 /lib/puppet
parent557ed85fd4c03cf3a5c48dce25000db6e71021a9 (diff)
downloadpuppet-ef86105215a00f428e9cdc251b6a29b8e11487bb.tar.gz
puppet-ef86105215a00f428e9cdc251b6a29b8e11487bb.tar.xz
puppet-ef86105215a00f428e9cdc251b6a29b8e11487bb.zip
(#4258) Check wgetopts in pkgutil.conf
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/provider/package/pkgutil.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index 30f23e059..08d74df29 100755
--- a/lib/puppet/provider/package/pkgutil.rb
+++ b/lib/puppet/provider/package/pkgutil.rb
@@ -6,6 +6,13 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
pkguti = "/opt/csw/bin/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/ }
+ if ! correct_wgetopts
+ Puppet.notice "It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf."
+ end
+
confine :operatingsystem => :solaris
commands :pkguti => pkguti