diff --git a/chroot.py b/chroot.py index 7a3bc0c..62a8000 100644 --- a/chroot.py +++ b/chroot.py @@ -174,7 +174,7 @@ def mount_crossdirect(native_chroot: str, target_chroot: str, target_arch: str, os.makedirs(native_mount, exist_ok=True) - ld_so = glob(f"{os.path.join('native_chroot', 'usr', 'lib', 'ld-linux-')}*")[0] + ld_so = glob(f"{os.path.join(native_chroot, 'usr', 'lib', 'ld-linux-')}*")[0] copy(ld_so, os.path.join(target_chroot, 'usr', 'lib')) logging.debug(f'Mounting {native_chroot} to {native_mount}') diff --git a/packages.py b/packages.py index 3f7ff8b..b6926dd 100644 --- a/packages.py +++ b/packages.py @@ -319,7 +319,7 @@ def add_package_to_repo(package: Package, arch: str): for file in os.listdir(pkgbuild_dir): # Forced extension by makepkg.conf if file.endswith('.pkg.tar.xz') or file.endswith('.pkg.tar.zst'): - return add_file_to_repo(os.path.join(pkgbuild_dir, file), package.repo, arch) + add_file_to_repo(os.path.join(pkgbuild_dir, file), package.repo, arch) def check_package_version_built(package: Package, arch) -> bool: