Merge lp:~pefarrell/spud/child-elements-of-choice into lp:spud

[Patrick Farrell]

Fix lp:948475.

[Cian Wilson (cwilson)]

This has been tested on natty and a mac for a few days now with no issues seen.

review: Approve

=== modified file 'diamond/diamond/tree.py'
--- diamond/diamond/tree.py	2012-02-28 19:39:38 +0000
+++ diamond/diamond/tree.py	2012-03-13 10:45:57 +0000
@@ -230,20 +230,18 @@
     outlist = []
 
     for tree in treelist:
-      new_tree = None
       found = False
       for t in self.children:
         if t.schemaname == tree.schemaname:
-          tree = t
+          outlist.append(t)
           found = True
-          break
+
       if not found:
         tree.set_parent(self)
 
         self.children.append(tree)
         tree.recompute_validity()
-
-      outlist.append(tree)
+        outlist.append(tree)
 
       for tree in outlist:
         if tree.cardinality in ['+', '*']: