Bug #252243 - Fix binarytree.prevent_collision() so that it won't create a circular

symlink if there happens to be a symlink in $PKGDIR/All for some reason.
(trunk r12280)

svn path=/main/branches/2.1.6/; revision=12311

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 04f598a13cf4334c5785f02b746994157008ddc3..c71567f820c459d9724e997a811278fe6550aa39 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -322,7 +322,21 @@ class binarytree(object):
                myfile = mypkg + ".tbz2"
                mypath = os.path.join("All", myfile)
                dest_path = os.path.join(self.pkgdir, mypath)
-               if os.path.exists(dest_path):
+
+               try:
+                       st = os.lstat(dest_path)
+               except OSError:
+                       st = None
+               else:
+                       if stat.S_ISLNK(st.st_mode):
+                               st = None
+                               try:
+                                       os.unlink(dest_path)
+                               except OSError:
+                                       if os.path.exist(dest_path):
+                                               raise
+
+               if st is not None:
                        # For invalid packages, other_cat could be None.
                        other_cat = portage.xpak.tbz2(dest_path).getfile("CATEGORY")
                        if other_cat:
@@ -330,11 +344,7 @@ class binarytree(object):
                                other_cpv = other_cat + "/" + mypkg
                                self._move_from_all(other_cpv)
                                self.inject(other_cpv)
-               """The file may or may not exist. Move it if necessary and update
-               internal state for future calls to getname()."""
                self._move_to_all(cpv)
-               if os.path.exists(full_path):
-                       self.inject(cpv)
 
        def _ensure_dir(self, path):
                """
@@ -361,6 +371,7 @@ class binarytree(object):
                for future getname() calls."""
                mycat, mypkg = catsplit(cpv)
                myfile = mypkg + ".tbz2"
+               self._pkg_paths[cpv] = os.path.join("All", myfile)
                src_path = os.path.join(self.pkgdir, mycat, myfile)
                try:
                        mystat = os.lstat(src_path)
@@ -371,7 +382,7 @@ class binarytree(object):
                        dest_path = os.path.join(self.pkgdir, "All", myfile)
                        _movefile(src_path, dest_path, mysettings=self.settings)
                        self._create_symlink(cpv)
-               self._pkg_paths[cpv] = os.path.join("All", myfile)
+                       self.inject(cpv)
 
        def _move_from_all(self, cpv):
                """Move a package from ${PKGDIR}/All/${PF}.tbz2 to