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

[phipsy at users.sourceforge.net]

Revision: 13723
          http://gar.svn.sourceforge.net/gar/?rev=13723&view=rev
Author:   phipsy
Date:     2011-03-10 13:05:39 +0000 (Thu, 10 Mar 2011)

Log Message:
-----------
Additional patch to puppet to cater for issue 6324

Modified Paths:
--------------
    csw/mgar/pkg/puppet/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2011-03-10 11:34:18 UTC (rev 13722)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2011-03-10 13:05:39 UTC (rev 13723)
@@ -68,7 +68,9 @@
 # Not required. As soon as I've confirmed the downloaded version works well, I'll cut this fromt he Makefile.
 # PATCHFILES  = 0001-pkgutil-support.patch
 # PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch
-PATCHFILES += 0003-Use-opt-csw-share-puppet-modules-as-default.patch
+PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch
+# https://projects.puppetlabs.com/issues/6324
+PATCHFILES += 0004-patch-to-smf-provider-6324.patch
 
 CHECKPKG_OVERRIDES_CSWpuppet       += surplus-dependency|CSWfacter
 CHECKPKG_OVERRIDES_CSWpuppet       += missing-dependency|CSWpython

Added: csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch	                        (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/0004-patch-to-smf-provider-6324.patch	2011-03-10 13:05:39 UTC (rev 13723)
@@ -0,0 +1,14 @@
+--- a/lib/puppet/provider/service/smf.rb
++++ b/lib/puppet/provider/service/smf.rb
+@@ -54,10 +54,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
+   def startcmd
+     self.setupservice
+     case self.status
+-    when :stopped
+-      [command(:adm), :enable, @resource[:name]]
+     when :maintenance
+       [command(:adm), :clear, @resource[:name]]
++    else
++      [command(:adm), :enable, @resource[:name]]
+     end
+   end


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