From b2c924592c36ff1b694b688f28f675713c1669ba Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 16 Nov 2020 19:59:17 +0000 Subject: [PATCH] pbulk: Avoid cleaning $prefix on every bulk build in master mode. Whatever is in $prefix shouldn't affect the result -- both scanning and building happen in the workers -- and it is a bit of a nasty surprise for merely issuing bulkbuild-restart to nuke all the host's installed packages. --- pkgtools/pbulk/files/pbulk/scripts/pre-build | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build index ed9b3e714ab..e82301ae6ac 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pre-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build @@ -84,7 +84,22 @@ fi mkdir -p "${bulklog}" "${loc}" -@PREFIX@/libexec/pbulk/client-clean +case "${master_mode}" in +[nN][oO]) + # Make sure the prefix is clean before we scan so any + # preinstalled packages don't affect the scanning process. + @PREFIX@/libexec/pbulk/client-clean + ;; +[yY][eE][sS]) + # Scanning happens in a worker so we don't need to clean the + # prefix here; this way you can run pbulk on a system that has + # packages installed without disrupting those packages. + ;; +*) + echo "master_mode must be either yes or no." + exit 1 + ;; +esac # Log common settings... opsys=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OPSYS` -- 2.28.0