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 0B6541388B6 for ; Fri, 24 Oct 2014 22:55:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A4C2E08C7; Fri, 24 Oct 2014 22:55:12 +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 0DD6AE08C7 for ; Fri, 24 Oct 2014 22:55:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD7763402F9 for ; Fri, 24 Oct 2014 22:55:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F1448A85 for ; Fri, 24 Oct 2014 22:55:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1414191237.3c1366520d6ac404994d1d2c75d8750b16a4331c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3c1366520d6ac404994d1d2c75d8750b16a4331c X-VCS-Branch: master Date: Fri, 24 Oct 2014 22:55:07 +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: 33766f56-80ea-4559-a97b-b8cda8ab86f7 X-Archives-Hash: 6170108d9f96b8cd7d90a1004a5d389d commit: 3c1366520d6ac404994d1d2c75d8750b16a4331c Author: Zac Medico gentoo org> AuthorDate: Fri Oct 24 21:46:30 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 24 22:53:57 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3c136652 bin/ebuild: allow useful phases with pkg_config It makes sense to run pkg_config by itself, but special phases like "clean", "digest", and "manifest" can be useful. For example, if the developer modifies the ebuild, then it's useful to regenerate the manifest and use "clean" to discard the stale environment. Fixes: bfa98d7a5b7a ("fixed ebuild so") Reported-by: Vlastimil Babka gentoo.org> Reviewed-by: Alexander Berntsen gentoo.org> --- bin/ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/ebuild b/bin/ebuild index 02ee022..a62aa20 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -197,7 +197,11 @@ else: err('%s: does not seem to have a valid PORTDIR structure' % (ebuild,)) if len(pargs) > 1 and "config" in pargs: - err('"config" must not be called with any other phase') + other_phases = set(pargs) + other_phases.difference_update( + ("clean", "config", "digest", "manifest")) + if other_phases: + err('"config" must not be called with any other phase') def discard_digests(myebuild, mysettings, mydbapi): """Discard all distfiles digests for the given ebuild. This is useful when