From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Jun 2008 04:17:52 +0000 (-0000)
Subject: Bug #225285 - Allow digestcheck() to succeed when the Manifest is empty and
X-Git-Tag: v2.1.5.5~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb79e1f29945f02f22024a5a14de21338e5aa60e;p=portage.git

Bug #225285 - Allow digestcheck() to succeed when the Manifest is empty and
strict mode is disabled. (trunk r10636)

svn path=/main/branches/2.1.2/; revision=10637
---

diff --git a/pym/portage.py b/pym/portage.py
index 3d65c1341..932d6957e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4062,6 +4062,18 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0):
 		else:
 			return 1
 	mf = Manifest(pkgdir, mysettings["DISTDIR"])
+	manifest_empty = True
+	for d in mf.fhashdict.itervalues():
+		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 = output.EOutput()
 	eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
 	try: