diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-14 19:44:28 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-14 19:44:28 -0700 |
| commit | 7b9709d96425606366b56b33168544a6897d69b0 (patch) | |
| tree | 2c06469b07bf7830194448c3f00c209587a8583b | |
| parent | 7a216218968dc1d00f2881121870611bc1b5dd33 (diff) | |
| download | portage-7b9709d96425606366b56b33168544a6897d69b0.tar.gz portage-7b9709d96425606366b56b33168544a6897d69b0.tar.bz2 portage-7b9709d96425606366b56b33168544a6897d69b0.zip | |
digestcheck: remove empty/missing Manifest checks
These checks never really needed, and they are not valid for thin
manifests or allow-missing-manifests.
| -rw-r--r-- | pym/portage/package/ebuild/digestcheck.py | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py index 466fd059e..38a3eba56 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -30,32 +30,10 @@ def digestcheck(myfiles, mysettings, strict=False, justmanifest=None, mf=None): return 1 allow_missing = "allow-missing-manifests" in mysettings.features pkgdir = mysettings["O"] - manifest_path = os.path.join(pkgdir, "Manifest") - if not os.path.exists(manifest_path): - if allow_missing: - return 1 - writemsg(_("!!! Manifest file not found: '%s'\n") % manifest_path, - noiselevel=-1) - if strict: - return 0 - else: - return 1 if mf is None: mf = mysettings.repositories.get_repo_for_location( os.path.dirname(os.path.dirname(pkgdir))) mf = mf.load_manifest(pkgdir, mysettings["DISTDIR"]) - manifest_empty = True - for d in mf.fhashdict.values(): - if d: - manifest_empty = False - break - if manifest_empty: - writemsg(_("!!! Manifest is empty: '%s'\n") % manifest_path, - noiselevel=-1) - if strict: - return 0 - else: - return 1 eout = EOutput() eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" try: |