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 4F1CE1388C0 for ; Tue, 23 Feb 2016 20:32:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 373E4E07D5; Tue, 23 Feb 2016 20:32:06 +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 D79B3E07D5 for ; Tue, 23 Feb 2016 20:32:05 +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 CE539340AC8 for ; Tue, 23 Feb 2016 20:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 720A210AF for ; Tue, 23 Feb 2016 20:32:01 +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: <1456259509.db30bb430e5a022f6e358f32dbccba243637bf49.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: db30bb430e5a022f6e358f32dbccba243637bf49 X-VCS-Branch: master Date: Tue, 23 Feb 2016 20:32:01 +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: 0d054bdd-ecdc-43b5-9dab-5b7d80f7b9ec X-Archives-Hash: 31317692dc643f4b07ce60a5a225d29f commit: db30bb430e5a022f6e358f32dbccba243637bf49 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 23 17:21:09 2016 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 23 20:31:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=db30bb43 doebuild: abort for missing DIST digests Fix the ebuild(1) command to abort when DIST digests are missing, so behavior is consistent with emerge. Do not abort when generating a manifest (including when "digest" is in FEATURES), or when the ebuild --skip-manifest option is used (these cases are handled outside of the doebuild function). Acked-by: Brian Dolbec gentoo.org> pym/portage/package/ebuild/doebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index a4d4d9f..d926e03 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1033,7 +1033,7 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, if mf is not None: dist_digests = mf.getTypeDigests("DIST") if not fetch(fetchme, mysettings, listonly=listonly, - fetchonly=fetchonly, allow_missing_digests=True, + fetchonly=fetchonly, allow_missing_digests=False, digests=dist_digests): spawn_nofetch(mydbapi, myebuild, settings=mysettings, fd_pipes=fd_pipes)