|
Lines 2086-2093
Link Here
|
| 2086 |
os.unlink(mysettings["DISTDIR"]+"/"+myfile) |
2086 |
os.unlink(mysettings["DISTDIR"]+"/"+myfile) |
| 2087 |
fetched=0 |
2087 |
fetched=0 |
| 2088 |
else: |
2088 |
else: |
|
|
2089 |
eout = output.EOutput() |
| 2090 |
eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" |
| 2089 |
for x_key in mydigests[myfile].keys(): |
2091 |
for x_key in mydigests[myfile].keys(): |
| 2090 |
writemsg(">>> Previously fetched file: "+str(myfile)+" "+x_key+" ;-)\n") |
2092 |
eout.ebegin("Previously fetched: %s %s ;-)" % (myfile, x_key)) |
|
|
2093 |
eout.eend(0) |
| 2091 |
fetched=2 |
2094 |
fetched=2 |
| 2092 |
break #No need to keep looking for this file, we have it! |
2095 |
break #No need to keep looking for this file, we have it! |
| 2093 |
else: |
2096 |
else: |
|
Lines 2326-2354
Link Here
|
| 2326 |
if strict: |
2329 |
if strict: |
| 2327 |
return 0 |
2330 |
return 0 |
| 2328 |
mf = Manifest(pkgdir, mysettings["DISTDIR"]) |
2331 |
mf = Manifest(pkgdir, mysettings["DISTDIR"]) |
| 2329 |
okaymsg = " ;-)\n" |
2332 |
eout = output.EOutput() |
|
|
2333 |
eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1" |
| 2330 |
try: |
2334 |
try: |
| 2331 |
writemsg_stdout(">>> checking ebuild checksums") |
2335 |
eout.ebegin("checking ebuild checksums ;-)") |
| 2332 |
mf.checkTypeHashes("EBUILD") |
2336 |
mf.checkTypeHashes("EBUILD") |
| 2333 |
writemsg_stdout(okaymsg) |
2337 |
eout.eend(0) |
| 2334 |
writemsg_stdout(">>> checking auxfile checksums") |
2338 |
eout.ebegin("checking auxfile checksums ;-)") |
| 2335 |
mf.checkTypeHashes("AUX") |
2339 |
mf.checkTypeHashes("AUX") |
| 2336 |
writemsg_stdout(okaymsg) |
2340 |
eout.eend(0) |
| 2337 |
writemsg_stdout(">>> checking miscfile checksums") |
2341 |
eout.ebegin("checking miscfile checksums ;-)") |
| 2338 |
mf.checkTypeHashes("MISC", ignoreMissingFiles=True) |
2342 |
mf.checkTypeHashes("MISC", ignoreMissingFiles=True) |
| 2339 |
writemsg_stdout(okaymsg) |
2343 |
eout.eend(0) |
| 2340 |
for f in myfiles: |
2344 |
for f in myfiles: |
| 2341 |
writemsg_stdout(">>> checking %s" % f) |
2345 |
eout.ebegin("checking %s ;-)" % f) |
| 2342 |
mf.checkFileHashes(mf.findFile(f), f) |
2346 |
mf.checkFileHashes(mf.findFile(f), f) |
| 2343 |
writemsg_stdout(okaymsg) |
2347 |
eout.eend(0) |
| 2344 |
except KeyError, e: |
2348 |
except KeyError, e: |
|
|
2349 |
eout.eend(1) |
| 2345 |
writemsg("\n!!! Missing digest for %s\n" % str(e), noiselevel=-1) |
2350 |
writemsg("\n!!! Missing digest for %s\n" % str(e), noiselevel=-1) |
| 2346 |
return 0 |
2351 |
return 0 |
| 2347 |
except portage_exception.FileNotFound, e: |
2352 |
except portage_exception.FileNotFound, e: |
|
|
2353 |
eout.eend(1) |
| 2348 |
writemsg("\n!!! A file listed in the Manifest could not be found: %s\n" % str(e), |
2354 |
writemsg("\n!!! A file listed in the Manifest could not be found: %s\n" % str(e), |
| 2349 |
noiselevel=-1) |
2355 |
noiselevel=-1) |
| 2350 |
return 0 |
2356 |
return 0 |
| 2351 |
except portage_exception.DigestException, e: |
2357 |
except portage_exception.DigestException, e: |
|
|
2358 |
eout.eend(1) |
| 2352 |
writemsg("\n!!! Digest verification failed:\n", noiselevel=-1) |
2359 |
writemsg("\n!!! Digest verification failed:\n", noiselevel=-1) |
| 2353 |
writemsg("!!! %s\n" % e.value[0], noiselevel=-1) |
2360 |
writemsg("!!! %s\n" % e.value[0], noiselevel=-1) |
| 2354 |
writemsg("!!! Reason: %s\n" % e.value[1], noiselevel=-1) |
2361 |
writemsg("!!! Reason: %s\n" % e.value[1], noiselevel=-1) |
