summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-19 17:09:59 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-19 19:56:05 -0700
commitd2da1d45aaf44de7fd0648b3bab48887838549d8 (patch)
tree0981a11fef48ee851778eaf3ed2e635e7ad4155c /lib
parentbbc07f2581fc5475530310d3ee9d3a11c0d32eb5 (diff)
downloadpuppet-d2da1d45aaf44de7fd0648b3bab48887838549d8.tar.gz
puppet-d2da1d45aaf44de7fd0648b3bab48887838549d8.tar.xz
puppet-d2da1d45aaf44de7fd0648b3bab48887838549d8.zip
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)
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/resource/catalog.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 9b5e68fca..4b4342d11 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