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

[Matt Robinson]

The following commit has been merged in the experimental branch:
commit 341654ea16e662e31bb97ca260397939ac34692e
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Tue Mar 22 22:31:47 2011 -0700

    (#6820) Fix invalid next that should be a return
    
    The old code under ruby 1.8.7 if it was hit would result in:
    
    unexpected next (LocalJumpError)
    
    In Ruby 1.9 it doesn't even give you the chance to run the code since
    you get:
    
    compile error (SyntaxError)
    
    The code isn't tested so the intented behavior isn't clear, but in
    context this looks like the right change.
    
    Reviewed-by: Jacob Helwig <jacob at puppetlabs.com>

diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb
index bbb962a..f5a0733 100644
--- a/lib/puppet/provider/service/daemontools.rb
+++ b/lib/puppet/provider/service/daemontools.rb
@@ -67,7 +67,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     path = self.defpath
     unless FileTest.directory?(path)
       Puppet.notice "Service path #{path} does not exist"
-      next
+      return
     end
 
     # reject entries that aren't either a directory

-- 
Puppet packaging for Debian