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

[phipsy at users.sourceforge.net]

Revision: 17679
          http://gar.svn.sourceforge.net/gar/?rev=17679&view=rev
Author:   phipsy
Date:     2012-04-14 18:58:06 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
puppet: 2.7.13 testing

Modified Paths:
--------------
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/puppet/trunk/checksums
    csw/mgar/pkg/puppet/trunk/files/cswpuppetd

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2012-04-14 18:31:30 UTC (rev 17678)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2012-04-14 18:58:06 UTC (rev 17679)
@@ -7,8 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-# 2.7.12 is broken, don't use it! (http://projects.puppetlabs.com/issues/13204)
-VERSION = 2.7.12
+VERSION = 2.7.13
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -30,7 +29,7 @@
 DISTFILES += CSWpuppet.postinstall
 # 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.12 as of 24-Mar-12
+# Still not in 2.7.10 as of 19-Feb-12
 DISTFILES += pkgutil.rb
 DISTFILES += README.CSW
 DISTFILES += puppet.conf.example-CSW

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2012-04-14 18:31:30 UTC (rev 17678)
+++ csw/mgar/pkg/puppet/trunk/checksums	2012-04-14 18:58:06 UTC (rev 17679)
@@ -12,3 +12,4 @@
 64cca5cd88b8df10eb0d3829470890cc  puppet-2.7.10.tar.gz
 ca1141b3c7d077a128d20458db3b4102  puppet-2.7.11.tar.gz
 be0a220cb66fe149bdbc08a9790fc2d1  puppet-2.7.12.tar.gz
+8062f371cc7ec5c7e5cd5f4b6c3f9278  puppet-2.7.13.tar.gz

Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2012-04-14 18:31:30 UTC (rev 17678)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2012-04-14 18:58:06 UTC (rev 17679)
@@ -80,23 +80,8 @@
         | grep "${__s}"
 }
 
-get_pid_file() {
-    # The default pid file is /var/opt/csw/puppet/run/agent.pid
-    # but a different pid file can be set in puppet.conf.
-    __pidfile="/var/opt/csw/puppet/run/agent.pid"
-    conffile="/etc/opt/csw/puppet/puppet.conf"
-    if [ -r "$conffile" ]; then
-        pid_line=`get_line_with pidfile ${conffile}`
-        if [ -n "${pid_line}" ]; then
-            echo "${pid_line}" | cut -d= -f2 | tr -d ' '
-            return
-        fi
-    fi
-    echo "${__pidfile}"
-}
+pidfile=`$prefix/bin/puppet agent --configprint pidfile`
 
-pidfile=`$prefix/bin/puppet agent --genconf | awk '/pidfile/ { print $3 }'`
-
 case "$1" in
     start)
         printf "Starting Puppet client services:"

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