summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/pym/portage.py b/pym/portage.py
index b66486fb7..1aa41ae88 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5978,17 +5978,6 @@ class dblink:
# This blocks until we can get the dirs to ourselves.
self.lockdb()
- if os.stat(srcroot).st_dev == os.stat(destroot).st_dev:
- """ The merge process may move files out of the image directory,
- which causes invalidation of the .installed flag."""
- try:
- 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])
@@ -6078,6 +6067,16 @@ class dblink:
except:
pass
+ if os.stat(srcroot).st_dev == os.stat(destroot).st_dev:
+ """ The merge process may move files out of the image directory,
+ which causes invalidation of the .installed flag."""
+ try:
+ os.unlink(os.path.join(
+ os.path.dirname(normalize_path(srcroot)), ".installed"))
+ except OSError, e:
+ if e.errno != errno.ENOENT:
+ raise
+ del e
# get old contents info for later unmerging
oldcontents = self.getcontents()