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 37D221396D9 for ; Tue, 7 Nov 2017 23:14:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64273E0D6F; Tue, 7 Nov 2017 23:14:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D086E0D6F for ; Tue, 7 Nov 2017 23:14:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E778333BF24 for ; Tue, 7 Nov 2017 23:14:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 660F4988F for ; Tue, 7 Nov 2017 23:14:50 +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: <1510096481.007c84b4e5169d1cf44dc7c59c8b3ea793a18bc2.mgorny@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/digestgen.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 007c84b4e5169d1cf44dc7c59c8b3ea793a18bc2 X-VCS-Branch: master Date: Tue, 7 Nov 2017 23:14:50 +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: c7cacb4a-fb5f-4fee-a647-69002dff924a X-Archives-Hash: e075c755fd46cb0f063f9197d6efc3f8 commit: 007c84b4e5169d1cf44dc7c59c8b3ea793a18bc2 Author: Michał Górny gentoo org> AuthorDate: Tue Nov 7 23:14:17 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Nov 7 23:14:41 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=007c84b4 Quickfix handling manifest-required-hashes = None pym/portage/package/ebuild/digestgen.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pym/portage/package/ebuild/digestgen.py b/pym/portage/package/ebuild/digestgen.py index 40c1b7288..6f3f877cd 100644 --- a/pym/portage/package/ebuild/digestgen.py +++ b/pym/portage/package/ebuild/digestgen.py @@ -11,6 +11,7 @@ portage.proxy.lazyimport.lazyimport(globals(), ) from portage import os +from portage.const import MANIFEST2_HASH_DEFAULTS from portage.dbapi.porttree import FetchlistDict from portage.dep import use_reduce from portage.exception import InvalidDependString, FileNotFound, \ @@ -58,6 +59,8 @@ def digestgen(myarchives=None, mysettings=None, myportdb=None): mf = mysettings.repositories.get_repo_for_location(mytree) repo_required_hashes = mf.manifest_required_hashes + if repo_required_hashes is None: + repo_required_hashes = MANIFEST2_HASH_DEFAULTS mf = mf.load_manifest(mysettings["O"], mysettings["DISTDIR"], fetchlist_dict=fetchlist_dict)