From 7ad72439ce048f2a22e11cd267ccd61b463d26c9 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 7 May 2014 15:39:03 -0500 Subject: [PATCH] Bugfix: Don't require matching identifiers to match up collections. I changed this in some other places in the code before committing but this part stayed broken. Collections will match on order, type, and number of elements (pushing the problem to UI) - element identifiers can be different but will be preserved when possible. --- lib/galaxy/dataset_collections/structure.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/galaxy/dataset_collections/structure.py b/lib/galaxy/dataset_collections/structure.py index 9c09d0c52ed..07282bc4913 100644 --- a/lib/galaxy/dataset_collections/structure.py +++ b/lib/galaxy/dataset_collections/structure.py @@ -63,9 +63,6 @@ class Tree( object ): return False for my_child, other_child in zip( self.children, other_structure.children ): - if my_child[ 0 ] != other_child[ 0 ]: # Different identifiers, TODO: generalize - return False - # At least one is nested collection... if my_child[ 1 ].is_leaf != other_child[ 1 ].is_leaf: return False