[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     550101cb033e48faf63c2f8241ce3f60eaddfb27
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 19:36:02 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 06:04:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550101cb

distutils-r1.eclass: Defer wrapping scripts until after root-merge

Defer wrapping installed Python scripts until the files are merged
from impl-specific directory into ${ED}.  This should clear the way
into using 'dosym -r'.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 238ba033c5d..33608eb9fcc 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -921,8 +921,8 @@ distutils-r1_python_install() {
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
 		multibuild_merge_root "${root}" "${D%/}"
+		_distutils-r1_wrap_scripts "${D%/}" "${scriptdir}"
 	fi
 }