Store buildinfo and buildconfig files in GitStore's cache instead directly in the repo

Author: dmach

osc/build.py

@@ -941,7 +941,10 @@ def main(apiurl, store, opts, argv):
     bc_file = None
     bi_filename = '_buildinfo-%s-%s.xml' % (repo, arch)
     bc_filename = '_buildconfig-%s-%s' % (repo, arch)
-    if store is not None and store.is_package and os.access(core.store, os.W_OK):
+    if store is not None and hasattr(store, "cache_get_path"):
+        bi_filename = store.cache_get_path(bi_filename, makedirs=True)
+        bc_filename = store.cache_get_path(bc_filename, makedirs=True)
+    elif store is not None and store.is_package and os.access(core.store, os.W_OK):
         bi_filename = os.path.join(os.getcwd(), core.store, bi_filename)
         bc_filename = os.path.join(os.getcwd(), core.store, bc_filename)
     elif not os.access('.', os.W_OK):

osc/git_scm/store.py

@@ -328,10 +328,17 @@ def cache_list_files(self, *, pattern: Optional[str] = None, branch: Optional[st
             files = [i for i in files if fnmatch.fnmatch(i, pattern)]
         return files
 
-    def cache_read_file(self, filename: str, *, branch: Optional[str] = None) -> Optional[bytes]:
-        assert "/" not in filename
+    def cache_get_path(self, filename: str, *, branch: Optional[str] = None, makedirs: bool = False) -> str:
+        if "/" in filename:
+            raise ValueError(f"Filename must not contain path: {filename}")
         branch = branch or self._git.current_branch
         path = self._get_path(["cache", filename], branch=branch)
+        if makedirs:
+            os.makedirs(os.path.dirname(path), exist_ok=True)
+        return path
+
+    def cache_read_file(self, filename: str, *, branch: Optional[str] = None) -> Optional[bytes]:
+        path = self.cache_get_path(filename, branch=branch)
         with self._lock():
             try:
                 with open(path, "rb") as f:
@@ -340,9 +347,7 @@ def cache_read_file(self, filename: str, *, branch: Optional[str] = None) -> Opt
                 return None
 
     def cache_write_file(self, filename: str, data: bytes, *, branch: Optional[str] = None):
-        assert "/" not in filename
-        branch = branch or self._git.current_branch
-        path = self._get_path(["cache", filename], branch=branch)
+        path = self.cache_get_path(filename, branch=branch)
         with self._lock():
             os.makedirs(os.path.dirname(path), exist_ok=True)
             with open(path, "wb") as f:
@@ -352,9 +357,11 @@ def cache_delete_files(self, filenames: List[str], *, branch: Optional[str] = No
         branch = branch or self._git.current_branch
         with self._lock():
             for filename in filenames:
-                assert "/" not in filename
-                path = self._get_path(["cache", filename], branch=branch)
-                os.unlink(path)
+                path = self.cache_get_path(filename, branch=branch)
+                try:
+                    os.unlink(path)
+                except FileNotFoundError:
+                    pass
 
     # LAST BUILDROOT