Merge pull request #1034 from nexB/1007-resource-removal-error

Change ignore plugin logic #1007

Author: pombredanne

src/scancode/plugin_ignore.py

@@ -64,13 +64,23 @@ def process_codebase(self, codebase, ignore=(), **kwargs):
         }
 
         ignorable = partial(is_ignored, ignores=ignores)
-
+        rids_to_remove = []
         remove_resource = codebase.remove_resource
-        # first walk top down the codebase and collect ignored resource ids
+
+        # First, walk the codebase from the top-down and collect the rids of
+        # Resources that can be removed.
         for resource in codebase.walk(topdown=True):
             if ignorable(resource.path):
                 for child in resource.children(codebase):
-                    remove_resource(child)
+                    rids_to_remove.append(child.rid)
+                rids_to_remove.append(resource.rid)
+
+        # Then, walk bottom-up and remove the ignored Resources from the
+        # Codebase if the Resource's rid is in our list of rid's to remove.
+        for resource in codebase.walk(topdown=False):
+            resource_rid = resource.rid
+            if resource_rid in rids_to_remove:
+                rids_to_remove.remove(resource_rid)
                 remove_resource(resource)