diff options
Diffstat (limited to 'lib/portage/metadata.py')
| -rw-r--r-- | lib/portage/metadata.py | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/lib/portage/metadata.py b/lib/portage/metadata.py index 0bd2bcce4..869c10bb3 100644 --- a/lib/portage/metadata.py +++ b/lib/portage/metadata.py @@ -38,12 +38,11 @@ def action_metadata(settings, portdb, myopts, porttrees=None): "/var", ]: print( - "!!! PORTAGE_DEPCACHEDIR IS SET TO A PRIMARY " - + "ROOT DIRECTORY ON YOUR SYSTEM.", - file=sys.stderr, - ) - print( - "!!! This is ALMOST CERTAINLY NOT what you want: '%s'" % cachedir, + ( + "!!! PORTAGE_DEPCACHEDIR IS SET TO A PRIMARY " + "ROOT DIRECTORY ON YOUR SYSTEM.\n" + f"!!! This is ALMOST CERTAINLY NOT what you want: '{cachedir}'", + ), file=sys.stderr, ) sys.exit(73) @@ -76,8 +75,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): eclass_db.update_eclasses() porttrees_data.append(TreeData(portdb.auxdb[path], eclass_db, path, src_db)) - porttrees = [tree_data.path for tree_data in porttrees_data] - quiet = ( settings.get("TERM") == "dumb" or "--quiet" in myopts or not sys.stdout.isatty() ) @@ -101,7 +98,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): # Temporarily override portdb.porttrees so portdb.cp_all() # will only return the relevant subset. portdb_porttrees = portdb.porttrees - portdb.porttrees = porttrees + portdb.porttrees = (tree_data.path for tree_data in porttrees_data) try: cp_all = portdb.cp_all() finally: @@ -120,10 +117,9 @@ def action_metadata(settings, portdb, myopts, porttrees=None): for cp in cp_all: for tree_data in porttrees_data: - src_chf = tree_data.src_db.validation_chf dest_chf = tree_data.dest_db.validation_chf - dest_chf_key = "_%s_" % dest_chf + dest_chf_key = f"_{dest_chf}_" dest_chf_getter = operator.attrgetter(dest_chf) for cpv in portdb.cp_list(cp, mytree=tree_data.path): @@ -191,11 +187,11 @@ def action_metadata(settings, portdb, myopts, porttrees=None): # We don't want to skip the write unless we're really # sure that the existing cache is identical, so don't # trust _mtime_ and _eclasses_ alone. - for k in auxdbkeys: - if dest.get(k, "") != src.get(k, ""): - dest = None - break - + cache_is_identical = ( + True for k in auxdbkeys if dest.get(k, "") != src.get(k, "") + ) + if any(cache_is_identical): + dest = None if dest is not None: # The existing data is valid and identical, # so there's no need to overwrite it. @@ -219,8 +215,10 @@ def action_metadata(settings, portdb, myopts, porttrees=None): dead_nodes = set(tree_data.dest_db) except CacheError as e: writemsg_level( - "Error listing cache entries for " - + "'%s': %s, continuing...\n" % (tree_data.path, e), + ( + "Error listing cache entries for " + f"'{tree_data.path}': {e}, continuing...\n" + ), level=logging.ERROR, noiselevel=-1, ) |