Fixing #1949 - relationships now use attributes instead of a label

This was important because the use of the label to store attributes
was a holdover from the GRATR library, and if we didn't cease its
use before we switched to RESTful catalogs, then we'd be stuck with
the @label instance variable forever, essentially.

Now we can add and remove variables however we please.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index cb17de7b9..884206b4c 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -253,10 +253,8 @@ class Transaction
             # We have to dup the label here, else we modify the original edge label,
             # which affects whether a given event will match on the next run, which is,
             # of course, bad.
-            edge = orig_edge.class.new(orig_edge.source, orig_edge.target)
-            label = orig_edge.label.dup
-            label[:event] = events.collect { |e| e.name }
-            edge.label = label
+            edge = orig_edge.class.new(orig_edge.source, orig_edge.target, orig_edge.label)
+            edge.event = events.collect { |e| e.name }
             set_trigger(edge)
         end