[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 0598f35d6680e6f58f564c6da546ab307d0f3c3b
Author: Markus Roberts <Markus at reality.com>
Date:   Tue Jul 6 16:06:30 2010 -0700

    Fix for #4148 (2.6 is greater than 0.25.x)
    
    We had a hardcoded assumption that the version number would always start with
    a zero, and thus were failing to recognise 2.6.0 as greater than 0.25.x

diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index fd2f492..644170f 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -141,7 +141,7 @@ class Puppet::Parser::Resource < Puppet::Resource
 
     # Unless we're running >= 0.25, we're in compat mode.
     def metaparam_compatibility_mode?
-        ! (catalog and version = catalog.client_version and version = version.split(".") and version[0] == "0" and version[1].to_i >= 25)
+        ! (catalog and ver = (catalog.client_version||'0.0.0').split(".") and (ver[0] > "0" or ver[1].to_i >= 25))
     end
 
     def name

-- 
Puppet packaging for Debian