Always unlink the .installed flag prior to merge since portage.movefile() never leave...

svn path=/main/trunk/; revision=6986

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d27f320d62aecd1980ec2662991325a35827b3ab..f24c180a4d619fff3382926d836ffaae297ecff7 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1647,7 +1647,7 @@ class dblink(object):
                        self._collision_protect(srcroot, destroot, others_in_slot,
                                myfilelist+mylinklist, mylinklist)
 
-               if os.stat(srcroot).st_dev == os.stat(destroot).st_dev:
+               if True:
                        """ The merge process may move files out of the image directory,
                        which causes invalidation of the .installed flag."""
                        try: