CachedAddon: append location-based IDs to cache dirs

In order to force separate repos using overlapping IDs to use different
caches.

Note this will force cache rebuilds for all repos using the old cache
dir paths.

Fixes #321.

Author: radhermit

src/pkgcheck/addons/caches.py

@@ -7,6 +7,7 @@
 import shutil
 from collections import UserDict
 from dataclasses import dataclass
+from hashlib import blake2b
 from operator import attrgetter
 
 from snakeoil import klass
@@ -68,10 +69,14 @@ def update_cache(self, repo=None, force=False):
         raise NotImplementedError(self.update_cache)
 
     def cache_file(self, repo):
-        """Return the cache file for a given repository."""
-        return pjoin(
-            self.options.cache_dir, 'repos',
-            repo.repo_id.lstrip(os.sep), self.cache.file)
+        """Return the cache file for a given repository.
+
+        A unique token using the repo's location is used so separate repos
+        using the same identifier don't use the same cache file.
+        """
+        token = blake2b(repo.location.encode()).hexdigest()[:10]
+        dirname = f'{repo.repo_id.lstrip(os.sep)}-{token}'
+        return pjoin(self.options.cache_dir, 'repos', dirname, self.cache.file)
 
     def load_cache(self, path, fallback=None):
         cache = fallback

tests/scripts/test_pkgcheck_cache.py

@@ -32,7 +32,7 @@ def test_cache_profiles(self, capsys):
             out, err = capsys.readouterr()
             assert not err
             out = out.strip().splitlines()
-            assert out[-1] == 'standalone'
+            assert out[-1].startswith('standalone-')
             assert excinfo.value.code == 0
 
         # pretend to remove it