egencache: tweak metadata-transfer logic

Now is won't force metadata-transfer unless it's absolutely necessary.

diff --git a/bin/egencache b/bin/egencache
index 1b4fa0cb81912728661d11403a0ff843536311fd..f7b447130c5e0022506d15532746acecd1992872 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -881,20 +881,14 @@ def egencache_main(args):
                        return 1
 
        if options.update and 'metadata-transfer' not in settings.features:
-               metadata_transfer = True
+               # Forcibly enable metadata-transfer if portdbapi has a pregenerated
+               # cache that does not support eclass validation.
                repo_config = settings.repositories.get_repo_for_location(repo_path)
                cache = repo_config.get_pregenerated_cache(
                        portage.dbapi.dbapi._known_keys, readonly=True)
-               if cache is not None:
-                       if cache.complete_eclass_entries:
-                               # If the portdbapi's pregenerated cache supports eclass
-                               # validation, then there's no need to forcibly enable
-                               # metadata-transfer.
-                               metadata_transfer = False
-                       cache = None
-
-               if metadata_transfer:
+               if cache is not None and not cache.complete_eclass_entries:
                        settings.features.add('metadata-transfer')
+               cache = None
 
        settings.lock()