Fix ticket 974. My original "fix" wasn't. This actually fixes the problem by using a regular expression that matches only up to the first square bracket.

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/puppet/resource_reference.rb b/lib/puppet/resource_reference.rb
index d5fc90d1f..771a91be7 100644
--- a/lib/puppet/resource_reference.rb
+++ b/lib/puppet/resource_reference.rb
@@ -36,8 +36,8 @@ class Puppet::ResourceReference
     # If the title has square brackets, treat it like a reference and
     # set things appropriately; else, just set it.
     def title=(value)
-        if value =~ /^(.+)\[(.+)\]$/
-            @type = $1
+        if value =~ /^([^\[\]]+)\[(.+)\]$/
+            self.type = $1
             @title = $2
         else
             @title = value
diff --git a/spec/unit/resource_reference.rb b/spec/unit/resource_reference.rb
index ef172d80a..cbbd6ef51 100755
--- a/spec/unit/resource_reference.rb
+++ b/spec/unit/resource_reference.rb
@@ -40,6 +40,12 @@ describe Puppet::ResourceReference do
         ref.type.should == "Foo::Bar"
         ref.title.should == "yay"
     end
+
+    it "should interpret the title as a reference and assign appropriately if the type is nil and the title contains nested square brackets" do
+        ref = Puppet::ResourceReference.new(nil, "foo::bar[baz[yay]]")
+        ref.type.should == "Foo::Bar"
+        ref.title.should =="baz[yay]"
+    end
 end
 
 describe Puppet::ResourceReference, "when resolving resources without a catalog" do