summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage.py10
1 files changed, 10 insertions, 0 deletions
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])