summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-24 06:43:09 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-24 06:43:09 +0000
commiteee40c7e4715a2d57745a4f18927381d6393f395 (patch)
treebe168fca79226253a9233800347d70fb12841453
parent54697f2644844c83ae18480447b1b9cb4b784db7 (diff)
downloadportage-eee40c7e4715a2d57745a4f18927381d6393f395.tar.gz
portage-eee40c7e4715a2d57745a4f18927381d6393f395.tar.bz2
portage-eee40c7e4715a2d57745a4f18927381d6393f395.zip
Always unlink the .installed flag prior to merge since portage.movefile() never leaves intact.
svn path=/main/trunk/; revision=6986
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 1 insertions, 1 deletions
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: