diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-11-06 16:05:47 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-11-07 23:56:07 +0100 |
| commit | e1de82ebe6ef2dbaab7b56bcf2bb6ff75743a000 (patch) | |
| tree | 49b18193824db73261e99f0cd9992c13427902c6 /pym/portage/package/ebuild | |
| parent | Remove last traces of Manifest1 code (diff) | |
| download | portage-e1de82ebe6ef2dbaab7b56bcf2bb6ff75743a000.tar.gz portage-e1de82ebe6ef2dbaab7b56bcf2bb6ff75743a000.tar.bz2 portage-e1de82ebe6ef2dbaab7b56bcf2bb6ff75743a000.zip | |
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 <zmedico@gentoo.org>
Diffstat (limited to 'pym/portage/package/ebuild')
| -rw-r--r-- | pym/portage/package/ebuild/digestgen.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |