From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 8 Oct 2006 22:14:47 +0000 (-0000)
Subject: Make the merge phase automatically invalidate the ${PORTAGE_BUILDDIR}/.installed... 
X-Git-Tag: v2.1.2~683
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3704ce7bd94f3c74b6f7e209dc14834b78118ab;p=portage.git

Make the merge phase automatically invalidate the ${PORTAGE_BUILDDIR}/.installed flag since it may move files out of the image directory.

svn path=/main/trunk/; revision=4622
---

diff --git a/pym/portage.py b/pym/portage.py
index fff074035..3fd1dc337 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6029,6 +6029,16 @@ class dblink:
 		# This blocks until we can get the dirs to ourselves.
 		self.lockdb()
 
+		try:
+			""" The merge process may move files out of the image directory,
+			which causes invalidation of the .installed flag."""
+			os.unlink(os.path.join(
+				os.path.dirname(normalize_path(srcroot)), ".installed"))
+		except OSError, e:
+			if e.errno != errno.ENOENT:
+				raise
+			del e
+
 		otherversions=[]
 		for v in self.vartree.dbapi.cp_list(self.mysplit[0]):
 			otherversions.append(v.split("/")[1])