[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.4-89-gcbbd363

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit ebd924c22c1049cde5f110c6ec89de4d9358b649
Author: Markus Roberts <Markus at reality.com>
Date:   Sun May 2 00:21:37 2010 -0700

    Fix to the fix for #3295
    
    The output variable in the inner block wasn't visible in the outer block,
    and wasn't needed in any case, since the results are returned naturally
    if you just leave everything alone.

diff --git a/lib/puppet/parser/functions/generate.rb b/lib/puppet/parser/functions/generate.rb
index 55161df..cf46775 100644
--- a/lib/puppet/parser/functions/generate.rb
+++ b/lib/puppet/parser/functions/generate.rb
@@ -26,12 +26,8 @@ Puppet::Parser::Functions::newfunction(:generate, :type => :rvalue,
             end
 
             begin
-                Dir.chdir(File.dirname(args[0])) do
-                    output = Puppet::Util.execute(args)
-                end
+                Dir.chdir(File.dirname(args[0])) { Puppet::Util.execute(args) }
             rescue Puppet::ExecutionFailure => detail
-                raise Puppet::ParseError, "Failed to execute generator %s: %s" %
-                    [args[0], detail]
+                raise Puppet::ParseError, "Failed to execute generator #{args[0]}: #{detail}"
             end
-            output
 end

-- 
Puppet packaging for Debian