Ticket #204: patch

NEWS

@@ -4 +4 @@
 See ChangeLog for full commit logs; this is summarized/major changes.
 
 
+* make contentsSet.map_directory_structure go recursive-
+  this fixes ticket #204, invalid removal of files previously just merged.
+
 * make --newuse work with atoms/sets
 
 * add a cpy version of incremental_expansion

pkgcore/fs/contents.py

@@ -317 +317 @@
         # rewrite each node (resolving down the filepath chain)
         conflicts = sorted(contentsSet(self.iterdirs()).intersection(conflicts_d))
         obj = self.clone()
-        for conflict in conflicts:
-            # punt the conflict first, since we don't want it getting rewritten
-            obj.remove(conflict)
-            subset = self.child_nodes(conflict.location)
-            obj.difference_update(subset)
-            subset = subset.change_offset(conflict.location, conflict.resolved_target)
-            obj.update(subset)
-            if add_conflicting_sym:
-                obj.add(other[conflicts_d[conflict]])
+        while conflicts:
+            for conflict in conflicts:
+                # punt the conflict first, since we don't want it getting rewritten
+                obj.remove(conflict)
+                subset = obj.child_nodes(conflict.location)
+                obj.difference_update(subset)
+                subset = subset.change_offset(conflict.location, conflict.resolved_target)
+                obj.update(subset)
+                if add_conflicting_sym:
+                    obj.add(other[conflicts_d[conflict]])
+
+            # rebuild the targets first; sorted due to the fact that we want to
+            # rewrite each node (resolving down the filepath chain)
+            conflicts = sorted(contentsSet(obj.iterdirs()).intersection(conflicts_d))
         return obj
 
     def add_missing_directories(self, mode=0775, uid=0, gid=0, mtime=None):

pkgcore/test/fs/test_contents.py

@@ -196 +196 @@
                 self.mk_file("/usr/foo")])))
 
     def test_map_directory_structure(self):
-        old = contents.contentsSet([self.mk_file("/dir/a"),
-            self.mk_dir("/dir"), self.mk_link("/sym", "dir")])
+        old = contents.contentsSet([self.mk_dir("/dir"),
+            self.mk_link("/sym", "dir")])
         new = contents.contentsSet([self.mk_file("/sym/a"),
             self.mk_dir("/sym")])
         # verify the machinery is working as expected.
-        self.assertNotEqual(list(old.difference(new)), [self.mk_dir("/dir")])
         ret = new.map_directory_structure(old)
         self.assertEqual(sorted(ret), sorted([self.mk_dir("/dir"),
             self.mk_file("/dir/a")]))
 
+        # test recursion next.
+        old.add(self.mk_link("/dir/sym", "dir2"))
+        old.add(self.mk_dir("/dir/dir2"))
+        new.add(self.mk_file("/dir/sym/b"))
+        new.add(self.mk_dir("/sym/sym"))
+
+        ret = new.map_directory_structure(old)
+        self.assertEqual(sorted(ret), sorted([self.mk_dir("/dir"),
+            self.mk_file("/dir/a"), self.mk_dir("/dir/dir2"),
+            self.mk_file("/dir/dir2/b")]))
+        
+
     def test_add_missing_directories(self):
         src = [self.mk_file("/dir1/a"), self.mk_file("/dir2/dir3/b"),
             self.mk_dir("/dir1/dir4")]