parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

packages/__init__.py: cleanups, mostly logging

Browse source
This commit is contained in:
InsanePrawn 2022-08-14 04:17:26 +02:00
parent d70805f3a6
commit e3ad2edc69
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/__init__.py
View file

@ -112,6 +112,8 @@ def discover_packages(parallel: bool = True) -> dict[str, Pkgbuild]:
native_chroot = setup_build_chroot(config.runtime['arch'], add_kupfer_repos=False) native_chroot = setup_build_chroot(config.runtime['arch'], add_kupfer_repos=False)
results = [] results = []
logging.info("Parsing PKGBUILDs")
if parallel: if parallel:
chunks = (Parallel(n_jobs=multiprocessing.cpu_count() * 4)(delayed(parse_pkgbuild)(path, native_chroot) for path in paths)) chunks = (Parallel(n_jobs=multiprocessing.cpu_count() * 4)(delayed(parse_pkgbuild)(path, native_chroot) for path in paths))
else: else:
@ -124,7 +126,7 @@ def discover_packages(parallel: bool = True) -> dict[str, Pkgbuild]:
for package in results: for package in results:
for name in [package.name] + package.replaces: for name in [package.name] + package.replaces:
if name in packages: if name in packages:
logging.warn(f'Overriding {packages[package.name]} with {package}') logging.warning(f'Overriding {packages[package.name]} with {package}')
packages[name] = package packages[name] = package
# This filters the deps to only include the ones that are provided in this repo # This filters the deps to only include the ones that are provided in this repo
@ -135,11 +137,10 @@ def discover_packages(parallel: bool = True) -> dict[str, Pkgbuild]:
for p in packages.values(): for p in packages.values():
if found: if found:
break break
for name in p.names(): if dep in p.names():
if dep == name: logging.debug(f'Found {p.name} that provides {dep}')
logging.debug(f'Found {p.name} that provides {dep}') found = True
found = True break
break
if not found: if not found:
logging.debug(f'Removing {dep} from dependencies') logging.debug(f'Removing {dep} from dependencies')
package.local_depends.remove(dep) package.local_depends.remove(dep)
@ -292,6 +293,7 @@ def add_file_to_repo(file_path: str, repo_name: str, arch: Arch):
# clean up same name package from pacman cache # clean up same name package from pacman cache
cache_file = os.path.join(pacman_cache_dir, file_name) cache_file = os.path.join(pacman_cache_dir, file_name)
if os.path.exists(cache_file): if os.path.exists(cache_file):
logging.debug("Removing cached package file {cache_file}")
os.unlink(cache_file) os.unlink(cache_file)
cmd = [ cmd = [
'repo-add', 'repo-add',
@ -467,7 +469,7 @@ def setup_build_chroot(
init_prebuilts(arch) init_prebuilts(arch)
chroot = get_build_chroot(arch, add_kupfer_repos=add_kupfer_repos) chroot = get_build_chroot(arch, add_kupfer_repos=add_kupfer_repos)
chroot.mount_packages() chroot.mount_packages()
logging.debug(f'packages.py: Initializing {arch} build chroot') logging.debug(f'Initializing {arch} build chroot')
chroot.initialize(reset=clean_chroot) chroot.initialize(reset=clean_chroot)
chroot.write_pacman_conf() # in case it was initialized with different repos chroot.write_pacman_conf() # in case it was initialized with different repos
chroot.activate() chroot.activate()
@ -863,7 +865,7 @@ def cmd_list():
enforce_wrap() enforce_wrap()
logging.info('Discovering packages.') logging.info('Discovering packages.')
packages = discover_packages() packages = discover_packages()
logging.info('Done! Pkgbuilds:') logging.info(f'Done! {len(packages)} Pkgbuilds:')
for p in set(packages.values()): for p in set(packages.values()):
print( print(
f'name: {p.name}; ver: {p.version}; provides: {p.provides}; replaces: {p.replaces}; local_depends: {p.local_depends}; depends: {p.depends}' f'name: {p.name}; ver: {p.version}; provides: {p.provides}; replaces: {p.replaces}; local_depends: {p.local_depends}; depends: {p.depends}'