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

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

svn path=/main/trunk/; revision=10636
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index d4ad4b3ff..8b0f98d4e 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4052,6 +4052,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 = portage.output.EOutput()
 	eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
 	try: