From 90012f94f00ec2cf6b355bd9c30215b83c2b5b7f Mon Sep 17 00:00:00 2001
From: Brian Harring <ferringb@chromium.org>
Date: Fri, 14 Oct 2011 01:07:57 -0700
Subject: cache.util: drop completely dead module/code

Looks of it, this code was copied/mangled into action_metadata; the
noise/callbacks in use don't do anything, so drop them, the dead code,
and clean up the exception handling to reflect the new reality
(cherry picked from commit 320890fadbedf678119ac06d458ed6086075431e)
---
 pym/_emerge/actions.py | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'pym/_emerge/actions.py')

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 70a92c972..844cf28ed 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1698,7 +1698,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 	if onProgress is not None:
 		onProgress(maxval, curval)
 
-	from portage.cache.util import quiet_mirroring
 	from portage import eapi_is_supported, \
 		_validate_cache_for_unsupported_eapis
 
@@ -1707,7 +1706,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 	#  1) erase the progress bar
 	#  2) show the error message
 	#  3) redraw the progress bar on a new line
-	noise = quiet_mirroring()
 
 	for cp in cp_all:
 		for tree_data in porttrees_data:
@@ -1715,13 +1713,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 				tree_data.valid_nodes.add(cpv)
 				try:
 					src = tree_data.src_db[cpv]
-				except KeyError as e:
-					noise.missing_entry(cpv)
-					del e
-					continue
-				except CacheError as ce:
-					noise.exception(cpv, ce)
-					del ce
+				except (CacheError, KeyError):
 					continue
 
 				eapi = src.get('EAPI')
@@ -1731,8 +1723,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 				eapi_supported = eapi_is_supported(eapi)
 				if not eapi_supported:
 					if not _validate_cache_for_unsupported_eapis:
-						noise.misc(cpv, "unable to validate " + \
-							"cache for EAPI='%s'" % eapi)
 						continue
 
 				dest = None
@@ -1769,15 +1759,12 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 				try:
 					inherited = src.get('INHERITED', '')
 					eclasses = src.get('_eclasses_')
-				except CacheError as ce:
-					noise.exception(cpv, ce)
-					del ce
+				except CacheError:
 					continue
 
 				if eclasses is not None:
 					if not tree_data.eclass_db.is_eclass_data_valid(
 						src['_eclasses_']):
-						noise.eclass_stale(cpv)
 						continue
 					inherited = eclasses
 				else:
@@ -1785,7 +1772,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 
 				if tree_data.src_db.complete_eclass_entries and \
 					eclasses is None:
-					noise.corruption(cpv, "missing _eclasses_ field")
 					continue
 
 				if inherited:
@@ -1795,11 +1781,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 						eclasses = tree_data.eclass_db.get_eclass_data(inherited)
 					except KeyError:
 						# INHERITED contains a non-existent eclass.
-						noise.eclass_stale(cpv)
 						continue
 
 					if eclasses is None:
-						noise.eclass_stale(cpv)
 						continue
 					src['_eclasses_'] = eclasses
 				else:
@@ -1814,9 +1798,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 
 				try:
 					tree_data.dest_db[cpv] = src
-				except CacheError as ce:
-					noise.exception(cpv, ce)
-					del ce
+				except CacheError:
+					# ignore it; can't do anything about it.
+					pass
 
 		curval += 1
 		if onProgress is not None:
-- 
cgit v1.2.3-1-g7c22