packages/srcinfo_cache: move initialised_for to new .srcinfo_initialised.json file

constants.py

@@ -158,6 +158,7 @@ MAKEPKG_CMD = [
 
 SRCINFO_FILE = '.SRCINFO'
 SRCINFO_METADATA_FILE = '.srcinfo_meta.json'
+SRCINFO_INITIALISED_FILE = ".srcinfo_initialised.json"
 
 FLAVOUR_INFO_FILE = 'flavourinfo.json'
 FLAVOUR_DESCRIPTION_PREFIX = 'kupfer flavour:'

packages/build.py

@@ -412,9 +412,9 @@ def setup_sources(package: Pkgbuild, lazy: bool = True):
     cache = package.srcinfo_cache
     assert cache
     # catch cache._changed: if the PKGBUILD changed whatsoever, that's an indicator the sources might be changed
-    if lazy and not cache._changed and cache.src_initialised and cache.src_initialised == cache.checksums['PKGBUILD']:
+    if lazy and not cache._changed and cache.is_src_initialised():
         if cache.validate_checksums():
-            logging.debug(f"{package.path}: Sources already set up.")
+            logging.info(f"{package.path}: Sources already set up.")
             return
     makepkg_setup = ' '.join(MAKEPKG_CMD + [
         '--nodeps',
@@ -438,9 +438,8 @@ def setup_sources(package: Pkgbuild, lazy: bool = True):
     assert isinstance(result, subprocess.CompletedProcess)
     if result.returncode != 0:
         raise Exception(f'{package.path}: Failed to setup sources, exit code: {result.returncode}')
-    cache.refresh_all(write=False)
+    cache.refresh_all(write=True)
-    cache.src_initialised = cache.checksums['PKGBUILD']
+    cache.write_src_initialised()
-    cache.write()
     old_version = package.version
     package.refresh_sources()
     if package.version != old_version:

packages/srcinfo_cache.py

@@ -8,7 +8,7 @@ import subprocess
 from typing import Any, ClassVar, Optional
 
 from config.state import config
-from constants import MAKEPKG_CMD, SRCINFO_FILE, SRCINFO_METADATA_FILE
+from constants import MAKEPKG_CMD, SRCINFO_FILE, SRCINFO_METADATA_FILE, SRCINFO_INITIALISED_FILE
 from dataclass import DataClass
 from exec.cmd import run_cmd
 from utils import sha256sum
@@ -50,12 +50,27 @@ class JsonFile(DataClass):
         return type(self)._read_file(self._relative_path)
 
 
+class SrcInitialisedFile(JsonFile):
+
+    PKGBUILD: str
+    _filename: ClassVar[str] = SRCINFO_INITIALISED_FILE
+
+    def __init__(self, relative_path: str, raise_exception: bool = False):
+        self._relative_path = relative_path
+        try:
+            content = self.read()
+            assert isinstance(content, dict)
+            self.update(content)
+        except Exception as ex:
+            if raise_exception:
+                raise ex
+
+
 class SrcinfoMetaFile(JsonFile):
 
     checksums: dict[str, str]
     build_mode: Optional[str]
     build_nodeps: Optional[bool]
-    src_initialised: Optional[str]
 
     _changed: bool
     _filename: ClassVar[str] = SRCINFO_METADATA_FILE
@@ -64,8 +79,7 @@ class SrcinfoMetaFile(JsonFile):
     def parse_existing(relative_pkg_dir: str) -> SrcinfoMetaFile:
         'tries to parse the srcinfo_meta.json file in the specified pkgbuild dir'
         metadata_raw = SrcinfoMetaFile._read_file(relative_pkg_dir)
-        defaults = {'src_initialised': None}
+        return SrcinfoMetaFile.fromDict(metadata_raw | {
-        return SrcinfoMetaFile.fromDict(defaults | metadata_raw | {
             '_relative_path': relative_pkg_dir,
             '_changed': False,
         })
@@ -79,7 +93,6 @@ class SrcinfoMetaFile(JsonFile):
             'build_mode': '',
             'build_nodeps': None,
             'checksums': {},
-            'src_initialised': None,
         })
         return s, s.refresh_all()
 
@@ -193,3 +206,27 @@ class SrcinfoMetaFile(JsonFile):
                 logging.debug(f'{self._relative_path}: Checksum for file "{filename}" doesn\'t match')
                 return False
         return True
+
+    def is_src_initialised(self) -> bool:
+        checksum = self.checksums["PKGBUILD"]
+        assert checksum
+        try:
+            initfile = SrcInitialisedFile(self._relative_path, raise_exception=True)
+            if "PKGBUILD" not in initfile:
+                raise Exception("'PKGBUILD' not in parser output")
+            initialised_checksum = initfile.PKGBUILD
+        except Exception as ex:
+            logging.debug(f"{self._relative_path}: Couldn't read or parse {SRCINFO_INITIALISED_FILE}: {ex}")
+            initialised_checksum = None
+        result = checksum == initialised_checksum
+        if initialised_checksum and not result:
+            logging.debug("Sources were set up for a different version. "
+                          f"Current PKGBUILD checksum: {checksum}; "
+                          f"Initialised for: {initialised_checksum}")
+        return result
+
+    def write_src_initialised(self):
+        initfile = SrcInitialisedFile(self._relative_path)
+        self.refresh_checksums()
+        initfile.PKGBUILD = self.checksums["PKGBUILD"]
+        initfile.write()