From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 17 Oct 2007 20:41:22 +0000 (-0000)
Subject: Always unlink the .installed flag prior to merge since
X-Git-Tag: v2.1.3.16~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=885429d5bc8b6026f21186d4124b2b1f13d7e68c;p=portage.git

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 702f790ee..337c53b0a 100644
--- 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: