Always unlink the .installed flag prior to merge since

portage.movefile() never leaves intact. (trunk r6986)

svn path=/main/branches/2.1.2/; revision=8164

diff --git a/pym/portage.py b/pym/portage.py
index 702f790ee1906bcaa0c59d7ba86ff6558a37d737..337c53b0ae0170e18c682e493a60f8d7fdb25a2c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8040,7 +8040,7 @@ class dblink:
                                        print
                                sys.exit(1)
 
-               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: