diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-05-27 01:45:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-27 01:45:00 +0000 |
| commit | 3c838cc112da8daa1dab6efe8a3d048baab934b0 (patch) | |
| tree | f05b520986f5256e6218c181ac8d396c76a5c9fb /pym | |
| parent | cc0d0964fa848836798043a7e8b58b56217e8f8c (diff) | |
| download | portage-3c838cc112da8daa1dab6efe8a3d048baab934b0.tar.gz portage-3c838cc112da8daa1dab6efe8a3d048baab934b0.tar.bz2 portage-3c838cc112da8daa1dab6efe8a3d048baab934b0.zip | |
Add noiselevel=-1 to writemsg calls for legitimate errors in portage.digestcheck() so that important errors are printed even when --quiet is used.
svn path=/main/trunk/; revision=3424
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pym/portage.py b/pym/portage.py index 548d7fdc7..43b21f06f 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2351,7 +2351,8 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0): pkgdir = mysettings["O"] manifest_path = os.path.join(pkgdir, "Manifest") if not os.path.exists(manifest_path): - writemsg("!!! Manifest file not found: '%s'\n" % manifest_path) + writemsg("!!! Manifest file not found: '%s'\n" % manifest_path, + noiselevel=-1) if strict: return 0 mf = Manifest(pkgdir, mysettings["DISTDIR"]) @@ -2371,17 +2372,18 @@ def digestcheck(myfiles, mysettings, strict=0, justmanifest=0): mf.checkFileHashes(mf.findFile(f), f) writemsg_stdout(okaymsg) except KeyError, e: - writemsg("\n!!! Missing digest for %s\n" % str(e)) + writemsg("\n!!! Missing digest for %s\n" % str(e), noiselevel=-1) return 0 except portage_exception.FileNotFound, e: - writemsg("\n!!! A file listed in the Manifest could not be found: %s\n" % str(e)) + writemsg("\n!!! A file listed in the Manifest could not be found: %s\n" % str(e), + noiselevel=-1) return 0 except portage_exception.DigestException, e: - writemsg("\n!!! Digest verification failed:\n") - writemsg("!!! %s\n" % e.value[0]) - writemsg("!!! Reason: %s\n" % e.value[1]) - writemsg("!!! Got: %s\n" % e.value[2]) - writemsg("!!! Expected: %s\n" % e.value[3]) + writemsg("\n!!! Digest verification failed:\n", noiselevel=-1) + writemsg("!!! %s\n" % e.value[0], noiselevel=-1) + writemsg("!!! Reason: %s\n" % e.value[1], noiselevel=-1) + writemsg("!!! Got: %s\n" % e.value[2], noiselevel=-1) + writemsg("!!! Expected: %s\n" % e.value[3], noiselevel=-1) return 0 return 1 |