summaryrefslogtreecommitdiffstats
path: root/lib/puppet/resource
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-07-14 18:26:30 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-18 19:44:22 -0700
commitcf597d72dca288011cfa3e57451b8eba56ea51da (patch)
tree4160b208bccafb1ecc1258bf1d35b80131fa0dd0 /lib/puppet/resource
parentd6cbb2198e06bb6b8f0172b1a48c9717c7ce6e17 (diff)
downloadpuppet-cf597d72dca288011cfa3e57451b8eba56ea51da.tar.gz
puppet-cf597d72dca288011cfa3e57451b8eba56ea51da.tar.xz
puppet-cf597d72dca288011cfa3e57451b8eba56ea51da.zip
[#4233] Ruby regexps are not multiline by default, but Resource titles can be multiline
Puppet allows resource titles to contain newlines. We recently introduced several regexps that were failing on resources with multiline titles.
Diffstat (limited to 'lib/puppet/resource')
-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 d163fc17e..4ac99eeea 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 =~ /^(.+)\[(.*)\]/
+ ref =~ /^(.+)\[(.*)\]/m
[$1, $2]
end