summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-07-07 09:11:39 +0000
committerZac Medico <zmedico@gentoo.org>2009-07-07 09:11:39 +0000
commit06dc0a37b13f4aeefeee00f4df925cd41afa6a4e (patch)
treef64b7599ef42e5f349ba14fad31cd5c863adc166
parentf2b84992e811bfa6c87ccb334ed6399f2ed6c074 (diff)
downloadportage-06dc0a37b13f4aeefeee00f4df925cd41afa6a4e.tar.gz
portage-06dc0a37b13f4aeefeee00f4df925cd41afa6a4e.tar.bz2
portage-06dc0a37b13f4aeefeee00f4df925cd41afa6a4e.zip
Shorten the preserved libs message when in --quiet mode. Thanks to Sebastian
Mingramm (few) <s.mingramm@gmx.de> for this patch. svn path=/main/trunk/; revision=13803
-rw-r--r--pym/_emerge/main.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 482679629..f211f65c8 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -202,15 +202,21 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
if icount > 0:
out.einfo("Processed %d info files." % (icount,))
-def display_preserved_libs(vardbapi):
+def display_preserved_libs(vardbapi, myopts):
MAX_DISPLAY = 3
# Ensure the registry is consistent with existing files.
vardbapi.plib_registry.pruneNonExisting()
if vardbapi.plib_registry.hasEntries():
- print
- print colorize("WARN", "!!!") + " existing preserved libs:"
+ if "--quiet" in myopts:
+ print
+ print colorize("WARN", "!!!") + " existing preserved libs found"
+ return
+ else:
+ print
+ print colorize("WARN", "!!!") + " existing preserved libs:"
+
plibdata = vardbapi.plib_registry.getPreservedLibs()
linkmap = vardbapi.linkmap
consumer_map = {}
@@ -347,7 +353,7 @@ def post_emerge(root_config, myopts, mtimedb, retval):
display_news_notification(root_config, myopts)
if retval in (None, os.EX_OK) or (not "--pretend" in myopts):
- display_preserved_libs(vardbapi)
+ display_preserved_libs(vardbapi, myopts)
sys.exit(retval)