From e1de82ebe6ef2dbaab7b56bcf2bb6ff75743a000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 6 Nov 2017 16:05:47 +0100 Subject: Make manifest-required-hashes configurable The set of required hashes specify which hashes must be present for a distfile not to be refetched. It makes little sense to hardcode this value, and it is mostly useful for transition periods, so make it configurable via layout.conf and default to all hashes in manifest-hashes. Reviewed-by: Zac Medico --- pym/portage/package/ebuild/digestgen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym/portage/package') diff --git a/pym/portage/package/ebuild/digestgen.py b/pym/portage/package/ebuild/digestgen.py index 95d02db9b..40c1b7288 100644 --- a/pym/portage/package/ebuild/digestgen.py +++ b/pym/portage/package/ebuild/digestgen.py @@ -11,7 +11,6 @@ portage.proxy.lazyimport.lazyimport(globals(), ) from portage import os -from portage.const import MANIFEST2_REQUIRED_HASH from portage.dbapi.porttree import FetchlistDict from portage.dep import use_reduce from portage.exception import InvalidDependString, FileNotFound, \ @@ -58,6 +57,7 @@ def digestgen(myarchives=None, mysettings=None, myportdb=None): mytree = os.path.realpath(mytree) mf = mysettings.repositories.get_repo_for_location(mytree) + repo_required_hashes = mf.manifest_required_hashes mf = mf.load_manifest(mysettings["O"], mysettings["DISTDIR"], fetchlist_dict=fetchlist_dict) @@ -72,7 +72,7 @@ def digestgen(myarchives=None, mysettings=None, myportdb=None): # exist before and after the transition. required_hash_types = set() required_hash_types.add("size") - required_hash_types.add(MANIFEST2_REQUIRED_HASH) + required_hash_types.update(repo_required_hashes) dist_hashes = mf.fhashdict.get("DIST", {}) # To avoid accidental regeneration of digests with the incorrect -- cgit v1.2.3