From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CF2C158017 for ; Mon, 27 Sep 2021 20:51:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 500BDE09C9; Mon, 27 Sep 2021 20:51:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AC5AE09C9 for ; Mon, 27 Sep 2021 20:51:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E631342C68 for ; Mon, 27 Sep 2021 20:51:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 781E6A3 for ; Mon, 27 Sep 2021 20:51:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1632775853.4c2d9475fe14a8947f4f552a1be0b101bb1eef96.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/prepare_build_dirs.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4c2d9475fe14a8947f4f552a1be0b101bb1eef96 X-VCS-Branch: master Date: Mon, 27 Sep 2021 20:51:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fb8178b-5178-4be9-9ddf-b0afa531996f X-Archives-Hash: 14b54eb6042b1413007f6c4f71099a45 commit: 4c2d9475fe14a8947f4f552a1be0b101bb1eef96 Author: Michał Górny gentoo org> AuthorDate: Mon Sep 27 20:50:53 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Sep 27 20:50:53 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4c2d9475 prepare_build_dirs: Fix copytree() on Python 3.7 Signed-off-by: Michał Górny gentoo.org> lib/portage/package/ebuild/prepare_build_dirs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py index 2e2ef73f4..f37c9647b 100644 --- a/lib/portage/package/ebuild/prepare_build_dirs.py +++ b/lib/portage/package/ebuild/prepare_build_dirs.py @@ -483,9 +483,9 @@ def _prepare_fake_filesdir(settings): portage.util.ensure_dirs(filesdir, mode=0o755) # Copy files from real directory to ebuild directory (without metadata). - if os.path.isdir(real_filesdir): + if os.path.isdir(real_filesdir) and not os.path.isdir(filesdir): shutil.copytree( - real_filesdir, filesdir, copy_function=copyfile, dirs_exist_ok=True + real_filesdir, filesdir, copy_function=copyfile )