From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 7 Dec 2006 18:58:28 +0000 (-0000)
Subject: Fix the 'TypeError: not all arguments converted during string formatting' for bug... 
X-Git-Tag: v2.1.2~377
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2cdc01b14f5db5a8e95614815bc0813a20c6b433;p=portage.git

Fix the 'TypeError: not all arguments converted during string formatting' for bug #157385.

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

diff --git a/pym/portage.py b/pym/portage.py
index 7ff156315..61bffdc96 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2510,8 +2510,8 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
 							if os.path.basename(uri) == myfile:
 								myuris.append(uri)
 				if not fetch(myuris, mysettings):
-					writemsg("!!! File %s doesn't exist, can't update " + \
-						"Manifest\n" % myfile, noiselevel=-1)
+					writemsg(("!!! File %s doesn't exist, can't update " + \
+						"Manifest\n") % myfile, noiselevel=-1)
 					return 0
 		writemsg_stdout(">>> Creating Manifest for %s\n" % mysettings["O"])
 		try:
@@ -2520,8 +2520,8 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
 				assumeDistHashesAlways=(
 				"assume-digests" in mysettings.features))
 		except portage_exception.FileNotFound, e:
-			writemsg("!!! File %s doesn't exist, can't update " + \
-				"Manifest\n" % str(e), noiselevel=-1)
+			writemsg(("!!! File %s doesn't exist, can't update " + \
+				"Manifest\n") % e, noiselevel=-1)
 			return 0
 		mf.write(sign=False)
 		if "assume-digests" not in mysettings.features: