diff options
| author | Bryan Drewery <bryan@shatow.net> | 2021-10-12 06:30:40 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2021-10-12 16:11:26 +0300 |
| commit | 406602c9d2456c14720f13d969cfb0c6b90e28dd (patch) | |
| tree | e9d8d50d938bea6b0328823a9efb57dfbdef3b10 | |
| parent | ef1c6e57ac3ef95e4e7d4ff65a823951c2a8fbfb (diff) | |
download_from_repo: Properly fix wantedpkgs handling.
Fixes: c2360a0e4e
| -rw-r--r-- | src/share/poudriere/common.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 44ce14e4..3eb822f1 100644 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -3573,6 +3573,7 @@ download_from_repo() { local remote_all_annotations remote_all_abi local missing_pkgs pkg pkgbase cnt local remote_pkg_ver local_pkg_name local_pkg_ver found + local packages_rel if [ -z "${PACKAGE_FETCH_BRANCH-}" ]; then return 0 @@ -3733,19 +3734,16 @@ download_from_repo() { JNETNAME="n" injail xargs \ env ASSUME_ALWAYS_YES=yes \ ${pkg_bin} fetch -U < "${wantedpkgs}" - + relpath "${PACKAGES}" "${PACKAGES_PKG_CACHE}" packages_rel while mapfile_read_loop "${wantedpkgs}" pkgname; do if [ ! -e "${PACKAGES_PKG_CACHE}/${pkgname}.${PKG_EXT}" ]; then msg_warn "${COLOR_PORT}${pkgname}.${PKG_EXT}${COLOR_RESET} not found. Remote PKG_SUFX likely differs temporarily" continue fi - echo "${pkgname}.${PKG_EXT}" - done | ( - local packages_rel - + echo "${pkgname}" + done | tee "${MASTER_DATADIR}/pkg_fetch" | ( cd "${PACKAGES_PKG_CACHE}" - relpath "${PACKAGES}" "${PACKAGES_PKG_CACHE}" packages_rel - tee "${MASTER_DATADIR}/pkg_fetch" | + sed -e "s,\$,.${PKG_EXT}," | xargs -J % ln -fL % "${packages_rel}/All/" ) umountfs "${MASTERMNT}/var/cache/pkg" |