diff options
| author |   Brian Harring <ferringb@chromium.org> | 2011-09-23 16:43:28 -0700 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2011-09-27 23:31:54 -0700 |
| commit | f3101b3adce6731790f80f83fafece54b7bd8a63 (patch) | |
| tree | 4bc1d857c88c74386628eed2e84be48c2d3586b3 /pym/portage/package/ebuild/digestcheck.py | |
| parent | depgraph: handle unicode exception for bug 384749 (diff) | |
| download | gentoo-portage-f3101b3adce6731790f80f83fafece54b7bd8a63.tar.xz gentoo-portage-f3101b3adce6731790f80f83fafece54b7bd8a63.zip | |
manifest: controllable per repo
This adds three states to layout.conf key use-manifest; false, true, and strict.
false means "don't use manifests at all"
true means "use and generate manifests, but allow them to be missing"
strict means "manifests must be used everywhere in this repo"
BUG=chromium-os:11308
TEST=repoman manifest usage.
Diffstat (limited to 'pym/portage/package/ebuild/digestcheck.py')
| -rw-r--r-- | pym/portage/package/ebuild/digestcheck.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py index 6cbaad97a01..067aacca9a4 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -27,7 +27,6 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): if mysettings.get("EBUILD_SKIP_MANIFEST") == "1": return 1 - allow_missing = "allow-missing-manifests" in mysettings.features pkgdir = mysettings["O"] if mf is None: mf = mysettings.repositories.get_repo_for_location( @@ -72,7 +71,7 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): writemsg(_("!!! Got: %s\n") % e.value[2], noiselevel=-1) writemsg(_("!!! Expected: %s\n") % e.value[3], noiselevel=-1) return 0 - if allow_missing or mf.thin: + if mf.thin or mf.allow_missing: # In this case we ignore any missing digests that # would otherwise be detected below. return 1 |