[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit b1c57e9c15b1b7f079dc99dfc79e57fe3e5682e0
Author: Markus Roberts <Markus at reality.com>
Date:   Wed Nov 4 17:36:43 2009 -0800

    Al Hoang's patch for #2781, removing obsolete when/: syntax
    
    This is just Al's patch with removal of trailing ";"s.
    
    Signed-off-by: Markus Roberts <Markus at reality.com>

diff --git a/lib/puppet/parser/ast/boolean_operator.rb b/lib/puppet/parser/ast/boolean_operator.rb
index 160e0e6..89725d7 100644
--- a/lib/puppet/parser/ast/boolean_operator.rb
+++ b/lib/puppet/parser/ast/boolean_operator.rb
@@ -20,14 +20,14 @@ class Puppet::Parser::AST
             # return result
             # lazy evaluate right operand
             case @operator
-            when "and";
+            when "and"
                 if Puppet::Parser::Scope.true?(lval)
                     rval = @rval.safeevaluate(scope)
                     Puppet::Parser::Scope.true?(rval)
                 else # false and false == false
                     false
                 end
-            when "or";
+            when "or"
                 if Puppet::Parser::Scope.true?(lval)
                     true
                 else
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 34dc445..48fe3ea 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -120,10 +120,10 @@ module Puppet
             munge do |value|
                 newval = super(value)
                 case newval
-                when :true, :inf: true
-                when :false: false
-                when :remote: :remote
-                when Integer, Fixnum, Bignum:
+                when :true, :inf; true
+                when :false; false
+                when :remote; :remote
+                when Integer, Fixnum, Bignum
                     self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
 
                     # recurse == 0 means no recursion
@@ -131,7 +131,7 @@ module Puppet
 
                     resource[:recurselimit] = value
                     true
-                when /^\d+$/:
+                when /^\d+$/
                     self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit"
                     value = Integer(value)
 
@@ -154,8 +154,8 @@ module Puppet
             munge do |value|
                 newval = super(value)
                 case newval
-                when Integer, Fixnum, Bignum: value
-                when /^\d+$/: Integer(value)
+                when Integer, Fixnum, Bignum; value
+                when /^\d+$/; Integer(value)
                 else
                     raise ArgumentError, "Invalid recurselimit value %s" % value.inspect
                 end

-- 
Puppet packaging for Debian