Revert "Reapply "RepoConfig cache-format: rewrite to be simpler and safer""

This reverts commit 0721bff.

This is a refactoring, unnecessary for a release and CI is finally flushing
out it's breaking things.

It'll be reintroduced in a later release after things are quiet.

Signed-off-by: Brian Harring <ferringb@gmail.com>

Author: ferringb

src/pkgcore/ebuild/repo_objs.py

@@ -813,22 +813,16 @@ def _parse_config(self):
         )
         self.sign_commits = data.get("sign-commits", "false".lower() == "true")
 
-        if caches := data.get("cache-formats", "md5-dict").lower().split():
-            # we have preferred ordering for caches- trace the list selecting the 'most preferred'
-            for preferred_cache in self.supported_cache_formats:
-                if preferred_cache in caches:
-                    self.cache_format = preferred_cache
-                    break
-            else:
-                logger.warning(
-                    "no supported cache format for repo %r; caches requested: %r, supported is %r",
-                    self.location,
-                    caches,
-                    self.supported_cache_formats,
-                )
-                self.cache_format = None
+        v = set(data.get("cache-formats", "md5-dict").lower().split())
+        if not v:
+            v = [None]
         else:
-            self.cache_format = None
+            # sort into favored order
+            v = [f for f in self.supported_cache_formats if f in v]
+            if not v:
+                logger.warning("unknown cache format: falling back to md5-dict format")
+                v = ["md5-dict"]
+        self.cache_format = list(v)[0]
 
         profile_formats = set(data.get("profile-formats", "pms").lower().split())
         if not profile_formats:

tests/ebuild/test_repo_objs.py

@@ -665,8 +665,8 @@ def test_cache_format(self, caplog):
         with open(self.metadata_path, "w") as f:
             f.write("cache-formats = foo bar\n")
         repo_config = repo_objs.RepoConfig(self.repo_path)
-        assert repo_config.cache_format is None
-        assert "no supported cache format" in caplog.text
+        assert repo_config.cache_format == "md5-dict"
+        assert "unknown cache format:" in caplog.text
         caplog.clear()
 
         # known format