Hi, Here is my latest attemps at fixing #1088, hopefully this one will be the good one (I think that's the patch that has been the most posted on the puppet-dev list :-)).
As per Luke's comment, I broke up the patch in 3 parts, with their own tests. On this subject, does anybody know a few git-fu commands to interactively split patch hunks while interactively rebasing? I had moderate success with git add --interactive because when you're rebasing in interactive mode everything is already added to the index. I elided the parser.rb diff to lighten the patch. Please review, and comment as usual, Thanks Brice Brice Figureau (3): Fix #1088 - Collections collects catalog and virtual resource Fix #1088 - Collection can apply an override on collected resources Fix #1088 - allow collection override to succeed outside of hierarchy lib/puppet/parser/ast/collection.rb | 31 + lib/puppet/parser/collector.rb | 69 ++- lib/puppet/parser/grammar.ra | 22 +- lib/puppet/parser/parser.rb | 1455 +++++++++++++++-------------- lib/puppet/parser/resource.rb | 2 +- spec/unit/parser/ast/collection.rb | 63 ++ spec/unit/parser/collector.rb | 174 +++- spec/unit/parser/resource.rb | 6 + test/data/snippets/collection_override.pp | 8 + test/language/snippets.rb | 6 + 10 files changed, 1078 insertions(+), 758 deletions(-) create mode 100755 spec/unit/parser/ast/collection.rb create mode 100644 test/data/snippets/collection_override.pp --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
