Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id D68841A923A for ; Sat, 2 Jan 2021 21:54:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3290984D87; Sat, 2 Jan 2021 21:54:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6C2EB84D80 for ; Sat, 2 Jan 2021 21:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Rt4uwoSNPMIz for ; Sat, 2 Jan 2021 21:54:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DD3BA84D33 for ; Sat, 2 Jan 2021 21:54:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D1608FA9D; Sat, 2 Jan 2021 21:54:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1609624486284340" MIME-Version: 1.0 Date: Sat, 2 Jan 2021 21:54:46 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/pkgtools/pbulk/files/pbulk/scripts To: pkgsrc-changes@NetBSD.org Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20210102215446.D1608FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1609624486284340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Sat Jan 2 21:54:46 UTC 2021 Modified Files: pkgsrc/pkgtools/pbulk/files/pbulk/scripts: pre-build Log Message: 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. ok joerg To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1609624486284340 Content-Disposition: inline Content-Length: 1278 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build diff -u pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build:1.15 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build:1.16 --- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build:1.15 Wed Jan 8 15:12:01 2020 +++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build Sat Jan 2 21:54:46 2021 @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pre-build,v 1.15 2020/01/08 15:12:01 joerg Exp $ +# $NetBSD: pre-build,v 1.16 2021/01/02 21:54:46 riastradh Exp $ # # Copyright (c) 2007 Joerg Sonnenberger . # All rights reserved. @@ -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` --_----------=_1609624486284340--