[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Dominic Cleal]

The following commit has been merged in the experimental branch:
commit ef86105215a00f428e9cdc251b6a29b8e11487bb
Author: Juerg Walz <jwalz at pobox.com>
Date:   Tue Apr 5 10:35:42 2011 +0800

    (#4258) Check wgetopts in pkgutil.conf

diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb
index 30f23e0..08d74df 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

-- 
Puppet packaging for Debian