karolyi/ansible-freebsd-jailhost-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Need to validate data.pkg too

Browse source
This commit is contained in:
László Károlyi 2024-10-28 11:35:50 +01:00
parent 49e2bf1f07
commit 01f7ea4533
Signed by: karolyi
GPG key ID: 2DCAF25E55735BFE
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/pkgmirror-jailrevalidator.py
View file

@ -386,6 +386,7 @@ def half_liverun(pkgmirror_url: str, abi: str, verbose: bool, packages: str):
url_pkgsite_txz = '/'.join((url_prefix, 'packagesite.txz')) url_pkgsite_txz = '/'.join((url_prefix, 'packagesite.txz'))
# .txz will be phased out over time # .txz will be phased out over time
url_pkgsite_pkg = '/'.join((url_prefix, 'packagesite.pkg')) url_pkgsite_pkg = '/'.join((url_prefix, 'packagesite.pkg'))
url_data_pkg = '/'.join((url_prefix, 'data.pkg'))
if verbose: if verbose:
logger.debug(msg=f'Fetching {url_meta_conf}') logger.debug(msg=f'Fetching {url_meta_conf}')
meta_conf = \ meta_conf = \
@ -404,6 +405,11 @@ def half_liverun(pkgmirror_url: str, abi: str, verbose: bool, packages: str):
if verbose: if verbose:
logger.debug( logger.debug(
msg=f'{url_pkgsite_pkg} size is {len(pkgsite_pkg.content)}') msg=f'{url_pkgsite_pkg} size is {len(pkgsite_pkg.content)}')
data_pkg = \
_get_fetched_url(url=url_data_pkg, do_hash=False, cachebust=True)
if verbose:
logger.debug(
msg=f'{url_data_pkg} size is {len(data_pkg.content)}')
io = BytesIO(initial_bytes=pkgsite_txz.content) io = BytesIO(initial_bytes=pkgsite_txz.content)
resolver = DependencyResolver( resolver = DependencyResolver(
packages_txz_fd=io, verbose=verbose, passed_packages=packages) packages_txz_fd=io, verbose=verbose, passed_packages=packages)