mirror of
https://gitlab.com/kupfer/kupferbootstrap.git
synced 2025-02-22 21:25:43 -05:00
packages/pkgbuild: parse _nodeps and cache in srcinfo_cache
This commit is contained in:
parent
cac150d11b
commit
6ddab50e21
2 changed files with 25 additions and 6 deletions
|
@ -69,6 +69,7 @@ class Pkgbuild(PackageInfo):
|
|||
local_depends: list[str]
|
||||
repo: str
|
||||
mode: str
|
||||
nodeps: bool
|
||||
path: str
|
||||
pkgver: str
|
||||
pkgrel: str
|
||||
|
@ -100,6 +101,7 @@ class Pkgbuild(PackageInfo):
|
|||
self.local_depends = []
|
||||
self.repo = repo or ''
|
||||
self.mode = ''
|
||||
self.nodeps = False
|
||||
self.path = relative_path
|
||||
self.pkgver = ''
|
||||
self.pkgrel = ''
|
||||
|
@ -131,6 +133,7 @@ class Pkgbuild(PackageInfo):
|
|||
self.local_depends = list(pkg.local_depends)
|
||||
self.repo = pkg.repo
|
||||
self.mode = pkg.mode
|
||||
self.nodeps = pkg.nodeps
|
||||
self.path = pkg.path
|
||||
self.pkgver = pkg.pkgver
|
||||
self.pkgrel = pkg.pkgrel
|
||||
|
@ -230,6 +233,8 @@ def parse_pkgbuild(
|
|||
assert lines and srcinfo_cache
|
||||
assert 'build_mode' in srcinfo_cache
|
||||
mode = srcinfo_cache.build_mode
|
||||
assert 'build_nodeps' in srcinfo_cache
|
||||
nodeps = srcinfo_cache.build_nodeps
|
||||
if mode not in ['host', 'cross']:
|
||||
err = 'an invalid' if mode is not None else 'no'
|
||||
err_end = f": {repr(mode)}" if mode is not None else "."
|
||||
|
@ -237,6 +242,7 @@ def parse_pkgbuild(
|
|||
|
||||
base_package = Pkgbase(relative_pkg_dir, sources_refreshed=sources_refreshed, srcinfo_cache=srcinfo_cache)
|
||||
base_package.mode = mode
|
||||
base_package.nodeps = nodeps
|
||||
base_package.repo = relative_pkg_dir.split('/')[0]
|
||||
|
||||
current: Pkgbuild = base_package
|
||||
|
@ -425,6 +431,5 @@ def filter_pkgbuilds(
|
|||
result += [pkg]
|
||||
|
||||
if not allow_empty_results and not result:
|
||||
|
||||
raise Exception(f'No packages matched by {fields_err}: ' + ', '.join([f'"{p}"' for p in paths]))
|
||||
return result
|
||||
|
|
|
@ -20,6 +20,7 @@ class SrcinfoMetaFile(DataClass):
|
|||
|
||||
checksums: dict[str, str]
|
||||
build_mode: Optional[str]
|
||||
build_nodeps: Optional[bool]
|
||||
src_initialised: Optional[str]
|
||||
|
||||
_relative_path: str
|
||||
|
@ -47,6 +48,7 @@ class SrcinfoMetaFile(DataClass):
|
|||
'_relative_path': relative_pkg_dir,
|
||||
'_changed': True,
|
||||
'build_mode': '',
|
||||
'build_nodeps': None,
|
||||
'checksums': {},
|
||||
'src_initialised': None,
|
||||
})
|
||||
|
@ -74,6 +76,10 @@ class SrcinfoMetaFile(DataClass):
|
|||
if not force_refresh:
|
||||
logging.debug(f'{metadata._relative_path}: srcinfo checksums match!')
|
||||
lines = lines or metadata.read_srcinfo_file()
|
||||
for build_field in ['build_mode', 'build_nodeps']:
|
||||
if build_field not in metadata:
|
||||
metadata.refresh_build_fields()
|
||||
break
|
||||
else:
|
||||
lines = metadata.refresh_all(write=write)
|
||||
return metadata, lines
|
||||
|
@ -92,14 +98,22 @@ class SrcinfoMetaFile(DataClass):
|
|||
if checksums != checksums_old:
|
||||
self._changed = True
|
||||
|
||||
def refresh_build_mode(self):
|
||||
def refresh_build_fields(self):
|
||||
self['build_mode'] = None
|
||||
self['build_nodeps'] = None
|
||||
with open(os.path.join(config.get_path('pkgbuilds'), self._relative_path, 'PKGBUILD'), 'r') as file:
|
||||
lines = file.read().split('\n')
|
||||
for line in lines:
|
||||
if line.startswith('_mode='):
|
||||
self.build_mode = line.split('=', 1)[1].strip("\"'")
|
||||
return
|
||||
if not line.startswith('_') or '=' not in line:
|
||||
continue
|
||||
key, val = line.split('=', 1)
|
||||
val = val.strip("\"'")
|
||||
if key == '_mode':
|
||||
self.build_mode = val
|
||||
elif key == '_nodeps':
|
||||
self.build_nodeps = val.lower() == 'true'
|
||||
else:
|
||||
continue
|
||||
|
||||
def refresh_srcinfo(self) -> list[str]:
|
||||
'Run `makepkg --printsrcinfo` to create an updated SRCINFO file and return the lines from it'
|
||||
|
@ -127,7 +141,7 @@ class SrcinfoMetaFile(DataClass):
|
|||
def refresh_all(self, write: bool = True) -> list[str]:
|
||||
lines = self.refresh_srcinfo()
|
||||
self.refresh_checksums()
|
||||
self.refresh_build_mode()
|
||||
self.refresh_build_fields()
|
||||
if write:
|
||||
self.write()
|
||||
return lines
|
||||
|
|
Loading…
Add table
Reference in a new issue