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

Markus Roberts Markus at reality.com
Tue Jul 20 07:42:37 UTC 2010


The following commit has been merged in the upstream branch:
commit d2da1d45aaf44de7fd0648b3bab48887838549d8
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Jul 19 17:09:59 2010 -0700

    Tweak to tweak to fix for #4233 -- ":" is valid in type names
    
    The tweak to the fix for #4233 was too narrow, and precluded the possibility
    that a type name would contain colons e.g. (MySQL::User)

diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 9b5e68f..4b4342d 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



More information about the Pkg-puppet-devel mailing list