diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:25:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:25:33 +0000 |
| commit | 394bdf9f0ed2b21e7ce3c14d2e785516659cb77a (patch) | |
| tree | ae1111323ef763a2168670545da52c3d7749f60e | |
| parent | 25d14bf840c3e6e5471e8309e1e949ff3bae05dd (diff) | |
| download | portage-394bdf9f0ed2b21e7ce3c14d2e785516659cb77a.tar.gz portage-394bdf9f0ed2b21e7ce3c14d2e785516659cb77a.tar.bz2 portage-394bdf9f0ed2b21e7ce3c14d2e785516659cb77a.zip | |
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
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |