[csw-devel] SF.net SVN: gar:[17236] csw/mgar/pkg/puppet/trunk

[phipsy at users.sourceforge.net]

Revision: 17236
          http://gar.svn.sourceforge.net/gar/?rev=17236&view=rev
Author:   phipsy
Date:     2012-02-27 22:12:35 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
puppet: 2.7.11 build

Modified Paths:
--------------
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/puppet/trunk/checksums
    csw/mgar/pkg/puppet/trunk/files/pkgutil.rb

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2012-02-27 17:18:12 UTC (rev 17235)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2012-02-27 22:12:35 UTC (rev 17236)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-VERSION = 2.7.9
+VERSION = 2.7.11
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -27,9 +27,9 @@
 DISTFILES += cswpuppetmasterd
 DISTFILES += cswusergroup
 DISTFILES += CSWpuppet.postinstall
-# pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb
+# pkgutil.rb https://raw.github.com/domcleal/puppet/tickets/master/8011c/lib/puppet/provider/package/pkgutil.rb
 # Should be headed into 2.7 code - supports -t REPO
-# Still not in 2.7.6 as of 29/11/11
+# Still not in 2.7.10 as of 19-Feb-12
 DISTFILES += pkgutil.rb
 DISTFILES += README.CSW
 DISTFILES += puppet.conf.example-CSW
@@ -72,8 +72,6 @@
 TEST_SCRIPTS      =
 INSTALL_SCRIPTS   = puppet
 
-# PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch
-
 CHECKPKG_OVERRIDES_CSWpuppetmaster  = surplus-dependency|CSWruby18
 CHECKPKG_OVERRIDES_CSWpuppet        = surplus-dependency|CSWfacter
 CHECKPKG_OVERRIDES_CSWpuppet	   += surplus-dependency|CSWrubyaugeas

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2012-02-27 17:18:12 UTC (rev 17235)
+++ csw/mgar/pkg/puppet/trunk/checksums	2012-02-27 22:12:35 UTC (rev 17236)
@@ -9,3 +9,5 @@
 3851b1a33cde9d697d5c5c21ef795438  puppet-2.6.12.tar.gz
 6dfbeb7810524c97747f45aa194b506f  puppet-2.7.6.tar.gz
 474c11eeb3c6fc6dabe83b2f4510d038  puppet-2.7.9.tar.gz
+64cca5cd88b8df10eb0d3829470890cc  puppet-2.7.10.tar.gz
+ca1141b3c7d077a128d20458db3b4102  puppet-2.7.11.tar.gz

Modified: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb	2012-02-27 17:18:12 UTC (rev 17235)
+++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb	2012-02-27 22:12:35 UTC (rev 17236)
@@ -20,7 +20,7 @@
     correct_wgetopts = false
     [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath|
       File.open(confpath) do |conf|
-        conf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
+        conf.each_line {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
       end
     end
     if ! correct_wgetopts
@@ -149,10 +149,7 @@
     # Allow source to be one or more URLs pointing to a repository that all
     # get passed to pkgutil via one or more -t options
     if resource[:source]
-      sources = resource[:source]
-      sources = sources.split($/) if sources.is_a?(String)
-      sources = sources.flatten
-
+      sources = [resource[:source]].flatten
       pkguti *[sources.map{|src| [ "-t", src ]}, *args].flatten
     else
       pkguti *args.flatten
@@ -185,4 +182,3 @@
     run_pkgutil @resource, "-y", "-r", @resource[:name]
   end
 end
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.