diff options
| author | Bryan Drewery <bryan@shatow.net> | 2021-07-31 02:12:54 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2021-07-31 03:36:43 +0300 |
| commit | 2f91da2f020a20bf34b4623b0bcf7cf0529f8759 (patch) | |
| tree | 7b5da184b6f3ba6b796569a55c65768ac8e3fcb9 | |
| parent | c3ef8f5966ff4c27dd0784396f529558f396dc9d (diff) | |
Check for .PKG_EXT rather than .pkg in compat handlers
Also split long lines
(cherry picked from commit df11e22fd3d632b2cbb36f10e858874bf0f8ffac)
| -rwxr-xr-x | src/share/poudriere/common.sh | 11 | ||||
| -rwxr-xr-x | src/share/poudriere/pkgclean.sh | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 61df005a..08ebce58 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1912,7 +1912,11 @@ commit_packages() { [ ! -L "${PACKAGES_ROOT}/${name}" ] || continue if [ -e "${PACKAGES_ROOT}/${name}" ]; then case "${name}" in - .buildname|.jailversion|meta.pkg|meta.txz|digests.pkg|digests.txz|packagesite.pkg|packagesite.txz|All|Latest) + .buildname|.jailversion|\ + meta.${PKG_EXT}|meta.txz|\ + digests.${PKG_EXT}|digests.txz|\ + packagesite.${PKG_EXT}|packagesite.txz|\ + All|Latest) # Auto fix pkg-owned files unlink "${PACKAGES_ROOT}/${name}" ;; @@ -7142,7 +7146,10 @@ prepare_ports() { if [ $SKIPSANITY -eq 0 ]; then msg "Sanity checking the repository" - for n in repo.pkg repo.txz digests.pkg digests.txz packagesite.pkg packagesite.txz; do + for n in \ + repo.${PKG_EXT} repo.txz \ + digests.${PKG_EXT} digests.txz \ + packagesite.${PKG_EXT} packagesite.txz; do pkg="${PACKAGES}/All/${n}" if [ -f "${pkg}" ]; then msg "Removing invalid pkg repo file: ${pkg}" diff --git a/src/share/poudriere/pkgclean.sh b/src/share/poudriere/pkgclean.sh index 72022744..1aab480a 100755 --- a/src/share/poudriere/pkgclean.sh +++ b/src/share/poudriere/pkgclean.sh @@ -284,11 +284,11 @@ if [ $ret -eq 1 ]; then if [ ${DO_ALL} -eq 1 ]; then msg "Removing pkg repository files" rm -f "${PACKAGES}/meta.txz" \ - "${PACKAGES}/meta.pkg" \ + "${PACKAGES}/meta.${PKG_EXT}" \ "${PACKAGES}/digests.txz" \ - "${PACKAGES}/digests.pkg" \ + "${PACKAGES}/digests.${PKG_EXT}" \ "${PACKAGES}/packagesite.txz" \ - "${PACKAGES}/packagesite.pkg" + "${PACKAGES}/packagesite.${PKG_EXT}" else build_repo fi |