From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 02:25:33 +0000 (-0000)
Subject: Fix checksum error messages for bug #136947.  Thanks to truedfx for this patch which... 
X-Git-Tag: v2.1-r1~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=394bdf9f0ed2b21e7ce3c14d2e785516659cb77a;p=portage.git

Fix checksum error messages for bug #136947.  Thanks to truedfx for this patch which is also in trunk r3515.

svn path=/main/branches/2.1/; revision=3565
---

diff --git a/pym/portage.py b/pym/portage.py
index 43fc3d8c5..61fb472c8 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2151,7 +2151,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 									writemsg("!!! Previously fetched file: "+str(myfile)+"\n", noiselevel=-1)
 									writemsg("!!! Reason: "+reason[0]+"\n", noiselevel=-1)
 									writemsg("!!! Got:      %s\n!!! Expected: %s\n" % \
-										(reason[0], reason[1]), noiselevel=-1)
+										(reason[1], reason[2]), noiselevel=-1)
 									writemsg("Refetching...\n\n", noiselevel=-1)
 									os.unlink(mysettings["DISTDIR"]+"/"+myfile)
 									fetched=0
@@ -2281,7 +2281,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 									writemsg("!!! Reason: "+reason[0]+"\n",
 										noiselevel=-1)
 									writemsg("!!! Got:      %s\n!!! Expected: %s\n" % \
-										(reason[0], reason[1]), noiselevel=-1)
+										(reason[1], reason[2]), noiselevel=-1)
 									writemsg("Removing corrupt distfile...\n", noiselevel=-1)
 									os.unlink(mysettings["DISTDIR"]+"/"+myfile)
 									fetched=0