Changeset pkgcore,3263

Timestamp:

06/26/08 13:17:28 (8 weeks ago)

Author:

Brian Harring <ferringb@…>

Message:

set of fixups; add cmp to all FsBase?, fix ticket 204, and mangle binpkg unpacking to use new_cset instead of install

Location:

pkgcore

Files:

• NEWS (modified) (1 diff)
• pkgcore/binpkg/repository.py (modified) (1 diff)
• pkgcore/ebuild/portage_conf.py (modified) (1 diff)
• pkgcore/fs/contents.py (modified) (1 diff)
• pkgcore/fs/fs.py (modified) (3 diffs)
• pkgcore/merge/engine.py (modified) (1 diff)
• pkgcore/test/fs/test_contents.py (modified) (1 diff)
• pkgcore/test/fs/test_fs.py (modified) (1 diff)

pkgcore/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

pkgcore/pkgcore/binpkg/repository.py

@@ -42 +42 @@
 class force_unpacking(triggers.base):
 
-    required_csets = ('install',)
+    required_csets = ('new_cset',)
     priority = 5
     _hooks = ('sanity_check',)

pkgcore/pkgcore/ebuild/portage_conf.py

@@ -460 +460 @@
             if oe.errno != errno.ENOENT:
                 raise
+            if set(features).intersection(
+                ('buildpkg', 'pristine-buildpkg', 'buildsyspkg', 'unmerge-backup')):
+                logger.warn("disabling buildpkg related features since PKGDIR doesn't exist")
             pkgdir = None
+    else:
+       if set(features).intersection(
+           ('buildpkg', 'pristine-buildpkg', 'buildsyspkg', 'unmerge-backup')):
+           logger.warn("disabling buildpkg related features since PKGDIR is unset")
+
+
+    # yes, round two; may be disabled from above and massive else block sucks
+    if pkgdir is not None:
         # If we are not using the native bzip2 then the Tarfile.bz2open
         # the binpkg repository uses will fail.

pkgcore/pkgcore/fs/contents.py

@@ -318 +318 @@
         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
 

pkgcore/pkgcore/fs/fs.py

@@ -128 +128 @@
         return dirname(self.location)
 
+    def __cmp__(self, other):
+        return cmp(self.location, other.location)
 
 
@@ -192 +194 @@
     def __repr__(self):
         return "dir:%s" % self.location
-
-    def __cmp__(self, other):
-        return cmp(
-            self.location.split(path_seperator),
-            other.location.split(path_seperator))
 
 
@@ -232 +229 @@
             return self.target
         return normpath(pjoin(self.location, '../', self.target))
+
+    def __cmp__(self, other):
+        c = cmp(self.location, other.location)
+        if c:
+            return c
+        if isinstance(other, self.__class__):
+            return cmp(self.target, other.target)
+        return 0
 
     def __repr__(self):

pkgcore/pkgcore/merge/engine.py

@@ -35 +35 @@
         realpath=True))
     livefs.recursively_fill_syms(ondisk)
-    ret = initial.map_directory_structure(ondisk, add_conflicting_sym=False)
+    ret = initial.map_directory_structure(ondisk, add_conflicting_sym=True)
     return ret
 

pkgcore/pkgcore/test/fs/test_contents.py

@@ -197 +197 @@
 
     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):

pkgcore/pkgcore/test/fs/test_fs.py

@@ -157 +157 @@
             "/dar")
 
+    def test_cmp(self):
+        obj1 = self.make_obj(
+            location='/usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.1',
+            target='../tls/libnvidia-tls.so.1')
+        obj2 = self.make_obj(
+            location='/usr/lib32/opengl/nvidia/lib/libGL.s',
+            target='libGL.so.173.14.09')
+        self.assertTrue(obj1 > obj2)
+        self.assertTrue(obj2 < obj1)
+
+
 class Test_fsDev(TestCase, base):
     kls = fs.fsDev