Fix checksum error messages for bug #136947. Thanks to truedfx for this patch which...

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

diff --git a/pym/portage.py b/pym/portage.py
index 43fc3d8c5373ba15cf7dd33278cfd41221bf9504..61fb472c8b29b58f8dd3bab8f2165c2b81fbb41e 100644 (file)
--- 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