diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-10-03 02:42:53 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-03 02:42:53 -0700 |
| commit | d9d0606fe01618cc81fb0b862ada91149dad3746 (patch) | |
| tree | a8fc59143393b3c82fddb596c1f67437485e1db1 /pym/portage/repository | |
| parent | Implement GLEP 59 with control via layout.conf. (diff) | |
| download | portage-d9d0606fe01618cc81fb0b862ada91149dad3746.tar.gz portage-d9d0606fe01618cc81fb0b862ada91149dad3746.tar.bz2 portage-d9d0606fe01618cc81fb0b862ada91149dad3746.zip | |
GLEP 59: use manifest-hashes list in layout.conf
The manifest-hashes layout.conf setting simply overrides the hashes
that are generated. When unspecified, the MANIFEST2_HASH_DEFAULTS
constant is used instead (current value contains SHA1, SHA256, and
RMD160).
In order to enable SHA512 and WHIRLPOOL, and drop RMD160 and SHA1,
simply set "manifest-hashes = SHA256 SHA512 WHIRLPOOL" in layout.conf.
As with the previous boolean flags approach, manifest-hashes settings
become redundant and can be removed from layout.conf after a version
of portage with equivalent defaults is stable.
Diffstat (limited to 'pym/portage/repository')
| -rw-r--r-- | pym/portage/repository/config.py | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index c201fe751..779d432be 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -44,7 +44,7 @@ class RepoConfig(object): __slots__ = ['aliases', 'eclass_overrides', 'eclass_locations', 'location', 'user_location', 'masters', 'main_repo', 'missing_repo_name', 'name', 'priority', 'sync', 'format', 'sign_manifest', 'thin_manifest', 'allow_missing_manifest', 'create_manifest', 'disable_manifest', 'cache_is_authoritative', - 'trust_authoritative_cache', 'manifest_hash_flags'] + 'trust_authoritative_cache', 'manifest_hashes'] def __init__(self, name, repo_opts): """Build a RepoConfig with options in repo_opts @@ -118,7 +118,7 @@ class RepoConfig(object): self.allow_missing_manifest = False self.create_manifest = True self.disable_manifest = False - self.manifest_hash_flags = {} + self.manifest_hashes = None self.cache_is_authoritative = False @@ -131,7 +131,7 @@ class RepoConfig(object): kwds['thin'] = self.thin_manifest kwds['allow_missing'] = self.allow_missing_manifest kwds['allow_create'] = self.create_manifest - kwds['hash_flags'] = self.manifest_hash_flags + kwds['hashes'] = self.manifest_hashes if self.disable_manifest: kwds['from_scratch'] = True return manifest.Manifest(*args, **kwds) @@ -382,21 +382,10 @@ class RepoConfigLoader(object): repo.create_manifest = manifest_policy != 'false' repo.disable_manifest = manifest_policy == 'false' - if 'manifest-rmd160' in layout_data: - repo.manifest_hash_flags["RMD160"] = \ - layout_data['manifest-rmd160'].lower() == 'true' - - if 'manifest-sha1' in layout_data: - repo.manifest_hash_flags["SHA1"] = \ - layout_data['manifest-sha1'].lower() == 'true' - - if 'manifest-sha256' in layout_data: - repo.manifest_hash_flags["SHA256"] = \ - layout_data['manifest-sha256'].lower() == 'true' - - if 'manifest-whirlpool' in layout_data: - repo.manifest_hash_flags["WHIRLPOOL"] = \ - layout_data['manifest-whirlpool'].lower() == 'true' + manifest_hashes = layout_data.get('manifest-hashes') + if manifest_hashes is not None: + manifest_hashes = frozenset(manifest_hashes.upper().split()) + repo.manifest_hashes = manifest_hashes repo.cache_is_authoritative = layout_data.get('authoritative-cache', 'false').lower() == 'true' if not repo.trust_authoritative_cache: |