From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R41wa-0007Zj-G8 for garchives@archives.gentoo.org; Thu, 15 Sep 2011 02:44:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5640321C04E; Thu, 15 Sep 2011 02:44:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 236E021C04E for ; Thu, 15 Sep 2011 02:44:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA7941B401E for ; Thu, 15 Sep 2011 02:44:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1955A80042 for ; Thu, 15 Sep 2011 02:44:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <7b9709d96425606366b56b33168544a6897d69b0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/digestcheck.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7b9709d96425606366b56b33168544a6897d69b0 Date: Thu, 15 Sep 2011 02:44:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 08bc50494041461eebd2cde0eb001ae5 commit: 7b9709d96425606366b56b33168544a6897d69b0 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 15 02:44:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 15 02:44:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7b9709d9 digestcheck: remove empty/missing Manifest checks These checks never really needed, and they are not valid for thin manifests or allow-missing-manifests. --- 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/pack= age/ebuild/digestcheck.py index 466fd05..38a3eba 100644 --- a/pym/portage/package/ebuild/digestcheck.py +++ b/pym/portage/package/ebuild/digestcheck.py @@ -30,32 +30,10 @@ def digestcheck(myfiles, mysettings, strict=3DFalse, = justmanifest=3DNone, mf=3DNone): return 1 allow_missing =3D "allow-missing-manifests" in mysettings.features pkgdir =3D mysettings["O"] - manifest_path =3D 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=3D-1) - if strict: - return 0 - else: - return 1 if mf is None: mf =3D mysettings.repositories.get_repo_for_location( os.path.dirname(os.path.dirname(pkgdir))) mf =3D mf.load_manifest(pkgdir, mysettings["DISTDIR"]) - manifest_empty =3D True - for d in mf.fhashdict.values(): - if d: - manifest_empty =3D False - break - if manifest_empty: - writemsg(_("!!! Manifest is empty: '%s'\n") % manifest_path, - noiselevel=3D-1) - if strict: - return 0 - else: - return 1 eout =3D EOutput() eout.quiet =3D mysettings.get("PORTAGE_QUIET", None) =3D=3D "1" try: