From eee40c7e4715a2d57745a4f18927381d6393f395 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 24 Jun 2007 06:43:09 +0000 Subject: Always unlink the .installed flag prior to merge since portage.movefile() never leaves intact. svn path=/main/trunk/; revision=6986 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d27f320d6..f24c180a4 100644 --- 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: -- cgit v1.2.3-1-g7c22