From cb842e57256f9499053de3c855fd52d0ff47ce6a Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 30 Nov 2010 19:22:01 +0100 Subject: [PATCH] _merge_process: don't try to create path up to offset prefix A merge conflict went unnoticed, which introduced a regression where portage would try to create all dirs from root up to the file to merge. In Prefix, users often don't have permission to write there, and it isn't necessary. The search hence can just start from the offset prefix, since that space is controlled by Portage and should be writable. --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 44d2cd2df..7e1068939 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3461,7 +3461,7 @@ class dblink(object): # we do a first merge; this will recurse through all files in our srcroot but also build up a # "second hand" of symlinks to merge later - if self.mergeme(srcroot, destroot, outfile, secondhand, "", cfgfiledict, mymtime): + if self.mergeme(srcroot, destroot, outfile, secondhand, EPREFIX_LSTRIP, cfgfiledict, mymtime): return 1 # now, it's time for dealing our second hand; we'll loop until we can't merge anymore. The rest are -- 2.26.2