From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 56AC81384B4 for ; Wed, 18 Nov 2015 16:51:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DA9FE07E6; Wed, 18 Nov 2015 16:51:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A64CE07E6 for ; Wed, 18 Nov 2015 16:51:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33DA2340756 for ; Wed, 18 Nov 2015 16:50:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD6B7A7F for ; Wed, 18 Nov 2015 16:50:52 +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: <1447864347.8afd881d6f364a8fd8b71f46602caeda30c5ffe0.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8afd881d6f364a8fd8b71f46602caeda30c5ffe0 X-VCS-Branch: master Date: Wed, 18 Nov 2015 16:50:52 +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-Archives-Salt: a7d75152-e6b5-4429-99d6-796e1b5e0bc3 X-Archives-Hash: 09bbc3d4b45990553441338cf3928546 commit: 8afd881d6f364a8fd8b71f46602caeda30c5ffe0 Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 16:32:27 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Nov 18 16:32:27 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8afd881d src_prepare: Do not expect eapply_user in EAPIs not having it bin/phase-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index abbc602..042e242 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -376,7 +376,7 @@ __dyn_prepare() { __ebuild_phase src_prepare # keep path in eapply_user in sync! - if [[ ! -f ${T}/.portage_user_patches_applied ]]; then + if ___eapi_has_eapply_user && [[ ! -f ${T}/.portage_user_patches_applied ]]; then die "eapply_user (or default) must be called in src_prepare()!" fi