diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-10-05 08:51:11 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-10-05 08:52:29 +0200 |
| commit | c2da00e04086fa8eefc981e97ae3559d42c4937d (patch) | |
| tree | 6eab3d92042fc18f1eb5a6db5f2cd194c0dcc871 | |
| parent | Prepare for 3.0.27 release (diff) | |
| download | portage-c2da00e0.tar.gz portage-c2da00e0.tar.bz2 portage-c2da00e0.zip | |
Revert "Copy files/* into the work tree instead of symlinking it"
Revert the series of FILESDIR changes that keep causing new regressions.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | bin/phase-functions.sh | 2 | ||||
| -rw-r--r-- | lib/portage/package/ebuild/prepare_build_dirs.py | 35 |
2 files changed, 12 insertions, 25 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 9a4c97b16..d3221993d 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -296,7 +296,7 @@ __dyn_clean() { rm -rf "${PORTAGE_BUILDDIR}/build-info" rm -rf "${WORKDIR}" - rm -rf "${PORTAGE_BUILDDIR}/files" + rm -f "${PORTAGE_BUILDDIR}/files" fi if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py index 410c7e4ae..659198905 100644 --- a/lib/portage/package/ebuild/prepare_build_dirs.py +++ b/lib/portage/package/ebuild/prepare_build_dirs.py @@ -1,4 +1,4 @@ -# Copyright 2010-2021 Gentoo Authors +# Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 __all__ = ["prepare_build_dirs"] @@ -27,7 +27,6 @@ from portage.util import ( normalize_path, writemsg, ) -from portage.util.file_copy import copyfile from portage.util.install_mask import _raise_exc @@ -477,30 +476,18 @@ def _ensure_log_subdirs(logdir, subdir): ensure_dirs(current, uid=uid, gid=gid, mode=grp_mode, mask=0) -def _copytree(src, dst, **kwargs): - try: - shutil.copytree(src, dst, **kwargs) - except FileExistsError: - shutil.rmtree(dst) - shutil.copytree(src, dst, **kwargs) - - def _prepare_fake_filesdir(settings): real_filesdir = settings["O"] + "/files" - filesdir = settings["FILESDIR"] - - # Copy files from real directory to ebuild directory (without metadata). - if os.path.isdir(real_filesdir): - _copytree(real_filesdir, filesdir, copy_function=copyfile) - apply_recursive_permissions( - filesdir, - uid=portage_uid, - gid=portage_gid, - dirmode=0o750, - dirmask=0, - filemode=0o640, - filemask=0, - ) + symlink_path = settings["FILESDIR"] + + try: + link_target = os.readlink(symlink_path) + except OSError: + os.symlink(real_filesdir, symlink_path) + else: + if link_target != real_filesdir: + os.unlink(symlink_path) + os.symlink(real_filesdir, symlink_path) def _prepare_fake_distdir(settings, alist): |