[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 9569136329f87eeb102e589a3d5e9c26d8632aad
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Jul 23 09:50:29 2010 -0700

    Fix for 4314 -- Need to allow '-' in class name for refs
    
    I almost changed this to correspond to the lexer pattern ([a-z0-9][-\w]*) but
    that isn't quite right either (it would reintroduce the '::' problem).  Another
    option I considered was [^\[]+, but that has it's own problems.  In the end I
    just made the minimal change, adding '-' to the acceptable characters.

diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 4b4342d..a8668d8 100644
--- a/lib/puppet/resource/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -57,7 +57,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
   end
 
   def title_key_for_ref( ref )
-    ref =~ /^([\w:]+)\[(.*)\]$/m
+    ref =~ /^([-\w:]+)\[(.*)\]$/m
     [$1, $2]
   end
 

-- 
Puppet packaging for Debian