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

[phipsy at users.sourceforge.net]

Revision: 16499
          http://gar.svn.sourceforge.net/gar/?rev=16499&view=rev
Author:   phipsy
Date:     2011-12-14 10:28:27 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
puppet: testing a 2.7 release

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2011-12-14 09:50:55 UTC (rev 16498)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2011-12-14 10:28:27 UTC (rev 16499)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-VERSION = 2.6.12
+VERSION = 2.7.9
 CATEGORIES = apps
 
 define BLURB
@@ -28,7 +28,7 @@
 DISTFILES += CSWpuppet.postinstall
 # pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb
 # Should be headed into 2.7 code - supports -t REPO
-# Still not in 2.7.3 as of 9/9/11
+# Still not in 2.7.6 as of 29/11/11
 DISTFILES += pkgutil.rb
 DISTFILES += README.CSW
 DISTFILES += puppet.conf.example-CSW
@@ -71,7 +71,7 @@
 TEST_SCRIPTS      =
 INSTALL_SCRIPTS   = puppet
 
-PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch
+# PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch
 
 CHECKPKG_OVERRIDES_CSWpuppetmaster  = surplus-dependency|CSWruby18
 CHECKPKG_OVERRIDES_CSWpuppet        = surplus-dependency|CSWfacter

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2011-12-14 09:50:55 UTC (rev 16498)
+++ csw/mgar/pkg/puppet/trunk/checksums	2011-12-14 10:28:27 UTC (rev 16499)
@@ -7,3 +7,5 @@
 f60d8118ee1f3d68b2383acf3dd76d38  puppet-2.7.3.tar.gz
 c95639073a812a0c91119b10f46a66fb  puppet-2.6.11.tar.gz
 3851b1a33cde9d697d5c5c21ef795438  puppet-2.6.12.tar.gz
+6dfbeb7810524c97747f45aa194b506f  puppet-2.7.6.tar.gz
+474c11eeb3c6fc6dabe83b2f4510d038  puppet-2.7.9.tar.gz

Modified: csw/mgar/pkg/puppet/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/README.CSW	2011-12-14 09:50:55 UTC (rev 16498)
+++ csw/mgar/pkg/puppet/trunk/files/README.CSW	2011-12-14 10:28:27 UTC (rev 16499)
@@ -6,7 +6,7 @@
 will find an example skeleton puppet.conf that is designed to make the product
 confirm to our paths. To use the daemon with CSW paths, put the puppet.conf
 examples in /etc/puppet and /etc/opt/csw/puppet into place and start the
-daemon.
+daemon with --confdir=/etc/opt/csw/puppet.
 
 Naturally you're free to discard the examples and use the product's own
 preferred paths. If no puppet.conf is present in /etc/puppet this is how the

Modified: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb	2011-12-14 09:50:55 UTC (rev 16498)
+++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb	2011-12-14 10:28:27 UTC (rev 16499)
@@ -149,7 +149,11 @@
     # 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]
-      pkguti *[resource[:source].map{|src| [ "-t", src ]}, *args].flatten
+      sources = resource[:source]
+      sources = sources.split($/) if sources.is_a?(String)
+      sources = sources.flatten
+
+      pkguti *[sources.map{|src| [ "-t", src ]}, *args].flatten
     else
       pkguti *args.flatten
     end

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