diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-16 06:10:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-16 06:10:28 +0000 |
| commit | bc9d5c1d3235578f96d0da753b8123004b3ad4be (patch) | |
| tree | f55638c4fe0b907997c5aaa2c4ed67a454b53cbf | |
| parent | 1135dc0eb64614edd36b62849aee9ccfc6829613 (diff) | |
| download | portage-bc9d5c1d3235578f96d0da753b8123004b3ad4be.tar.gz portage-bc9d5c1d3235578f96d0da753b8123004b3ad4be.tar.bz2 portage-bc9d5c1d3235578f96d0da753b8123004b3ad4be.zip | |
Fix checksum error messages for bug #136947. Thanks to truedfx for this patch.
svn path=/main/trunk/; revision=3515
| -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 b1c1cd9a2..60d28f599 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2147,7 +2147,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 @@ -2277,7 +2277,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 |