[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:36 UTC 2010
The following commit has been merged in the upstream branch:
commit 40e6f02dd2ca9a7d8e2f1de00e83c46974b5ec6e
Author: Markus Roberts <Markus at reality.com>
Date: Mon Jul 19 11:21:52 2010 -0700
Tweak to fix for #4233 -- only accept word chars in types
With the title carrying semantic information it may contain arbitrary chars;
when parsing a ref we only want word chars in the type (up to the first open
square bracket) and everything else, enclosed in "[" / "]" to the end of the
string, is the title.
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 4ac99ee..9b5e68f 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 =~ /^(.+)\[(.*)\]/m
+ ref =~ /^(\w+)\[(.*)\]$/m
[$1, $2]
end
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list