From nobody Thu Oct 31 19:17:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XfYfP3Gh4z5cDcT for ; Thu, 31 Oct 2024 19:17:33 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfYfN0H3Gz4HF6 for ; Thu, 31 Oct 2024 19:17:31 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=lPLnjp+N; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1730402250; bh=x5yHbmBvLbI35BKNErpUaTcnV30Hi5j2LUuX+eGbnq0=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=lPLnjp+NXp+zEYNZHQc/ewKyl2itDnGX5qmzQgWplAhlxLwhOF8i7eVGRcnpqWLi5NdWNqx9RdwNbsiBLB3vCUawHk0zC9uAIUqCvsLB4DjRB0efrYOgIYHrJg/63djMPX9GuG/OurWs8hknRs8ipyvRE8y9PE0TUml/T2QmIkhIeyklvzESxRZFa6e+x2YmFGQMIX3/MkwK8GQXVpIQEvLEW0hQEvJR6DDVpHQjg6duC289iyxmLwX0Q8mjvmIakH5qTLQaMLfV+c1khCO12WCsKP0gMZh10WBGW+1MWejHwdMtzA3f2ZlQdmZYryCb9APo2B5BzQmXbDpvje70OQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1730402250; bh=VO9AuL0lqpqmYKmz+onktXQnKNFMfi9rRF/IRl7CatO=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=YMUlD1nrQ456NJRFUHMdL9zWJmiEbMfDwxfjSclbd43eRP199cCcvOfzZodh73ISQVaRRIfYCUJsqXbra4XGHNff59h+8gtSeBc0jxmMTrjLs1y4gDt9XbqD/dlbbdbaAZiHXvvwlD89XXZJLzGdo+tvtZ5jkWYU3p9SAc2EVyB/lZYcq9VHcazzLxEzeYKZvzzy9omrP9v7GDcoPFDs7bGta8NinboLou+8lfPl2Q/MB+a07C4QB0C2S/X6ltr6Wz8JAlW4YgFmw/Twd0HgPVOVpesY/qUeXvMeeNZbORbzbsl3T8Cf809eBO1l2o+x0HpIv9wSl3eB3U8KxR3Kbw== X-YMail-OSG: Se3PukoVM1nyPH4MRNcIi2D4G80AXQ_kCKdq8uRnTDtG.b9CPgXMIwe2WIScVw4 gpFDuWtQkVBqCFUmrf1V5nTV0tz05HZpfKRZDxtFSxmHW6VPJbhgdpEk.DN9sSpadNETBM8rjuWb EZ0VEybdVP5j8Rq2lly7O9F8mpEI0SXZtRludrcjTSJih3xOH3sEvpMT29B47RLpzX3QXkMVgveF RYjLHBOl6u4UPT5tTIOiOhjynlzBKPtFCBy7.PrPlcSpi.fv4GABmVPoFvkBMtNQSWdMxscSL1mh UQHFF.5CMqFH4ra9rkHMuW.M0VBQEeENAOisYUsvtaDEeVUNbRl1gP7Goic.UJOlSZ9cmjrHh4D_ cr1VTY0R.eie5l7qG0MPBtfOFfCUEbCuzkncMW.agdltDnotFEqP1TbQ04HSN3t_biaGmtE2_e14 sMCN6p75RQA1oBwVPd6.HEVutBEz4vh_DLRkWBPZdKtwUhWLUe5EetE5B8DHqtV8aW9SyIRwoulA 4OPakif2alnrHP7ZNoHGwfIoDe8ilYAr2rm7rCtI2pC9Qtg9U68FLGvZZI1keEp17Nrh0g_AQ6SF FEqGBejH.RZwv3YW3MqXoqbKoyRpq.9fpEi34lgEyDX4ZnRQaxSodYknkDHAC.v0Tq4mKBMXRG3B ukoVe2b.lfyLlY9cODGSUK59rViYwqex81pZ7EcQaaMzzBZm962V991N7PsvpHBzo4i3IFKd2FcR HqnW6Q87plbEsu12tbS_DxMNtfI_GPZVa18jTlF3nOUPKxj6PY6tJyxGxFVOjdvIFCdSD_h6p4eP RpmsVdfsGRK9q4rPO7X1iV1hj6VYbRDSSQCLyWTvCRQngc4HsNqDOkW8tC7qnFtG1gw3EhdoSSE3 oYs7xZwHW1Z5D7Lp5vbBtysn_D8c85gUbWpQPdvSLVvRySzj4vND1qwhS7FJQoKACbelbf.sfn.T DwPCUoPphDP.D6r3.pEAlJI8jKJR3k.exgXMoGz1PP3z.h_s4uT5TmzGt7nLdeN5VN4odcy3kZq8 CHjp6GFdcGVbatI8ExE2qO2iZU6C_xpJvWtx3nqEPfLsARhbOJydjJ5DfDhkf6EEPvkVsKK57nS5 R55EOPIXcvHNMbIwkXGoineKL_9a3OGqogtLxIhr4vSDFgob_QfsnkdE3jOQPnrwAfuJ.dtwQkSi JW5BHjdNHkcHCRMxy7n3EH7NoiXsNWwicjEvlS6hNyI2sfHl_NvPpeVLSY0sORUcGaZqMvV7bYOx KLbZ4NTNaR9jdqGPZERBAURCK.yIW6vlOt6wauk8mEpvhBsJPz0t0AKyBlBwSsuUMDFIT0Xj_Dhg _cGaUs_nXzQnEx_x5ucc1wCZYb4tAucpyNc1VXZqPJ1hKiw2i4PGSO.5pZb2U3j75ch24xAEwTVE mVBmonGRKVokkpbvQUj6uMfvl2sbjch_8B4O7IvmQ5U2AA71z2c8S3TEWEghatPvQ2GZnq4bWMiM xGmowCvAStAn9Q4wS0veubyRkp.C0mfD7kOB3zjBbDIKD_myQmQRVknZ3FcmAfT5nSZ67KVNUm0y IO.sOo4FLZB_fUPMQKNSzi.c0b13WBJU.JfwCG24uRlS4KyHZc0c.ZGBXZlQe80wYjiYyBHTGgVq 1h6MfKGI4l54OrDvJV70jusAKhij.I.1IiQuAPa4egrNs0UYn31eGlOiCD7wPS_oYizK5qPaDkoZ v0IZmXX3ZXuLBQHjNjrCUhfRwlEuTEreHO57uB44X81mPzsTPZVqVL2IxRFqi84068LdCgwIM_QS TvVfzIYMdgPbhn2JvUjTGlwqw4aElxUEgtc0wLh.TcaOYTYnzbpKffMaP3_m69mqu2eg0MIsbQmI iyFYPiuQzxzafeM70JEYoRPx.vC0eIiH9e_McXYrJAXbb7zFh76BSGFeEih_TZx4TkCosxRVH4m. _sdOylpJTqMzn0uEtgWo_850Z3vGpEN5rlpDiTIJIRRyxTnWT7i2bDgMMjQIOFveeOgElCFiZgq4 Eh7.BZfG7AwqhGeqttFYw.K_FhVp26JMg8g5jVkS11yG0YjFgu6UYZ9JB9rE1.gDp1hnXSk4sKmg L1vWF6OJJQEh4yff2Ag_mm71I7f9vqp8RPaZmgIlZIJP2SnCuiXT5S6MY2nee.HQ4FYXX27B5qWp soq92MktVh4L17H3.ezsJYp3BWluJNjpPZ02vUsBba3b4CwH_YAZa_B_hpXjxN_vhj45xviEVhQt iN5FLP38Q7kS7b4E6jxQKpotHBjs56bFZWv1I9tcOkm3_KRBcJf2OQY3NxlWdZKD6FlHRNEHFXXm aY8OWupBaxQudHasqW6IEL6rZBw-- X-Sonic-MF: X-Sonic-ID: 06117768-dd4b-41c8-8699-e7ca73975490 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Thu, 31 Oct 2024 19:17:30 +0000 Received: by hermes--production-gq1-5dd4b47f46-k4d2j (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 95483b20f7eca4fd689f6bfd65fe8eb7; Thu, 31 Oct 2024 19:17:28 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51\)) Subject: RE: git: cf1aba2857c1 - main - freebsd-update: refuse to operate on a pkgbase system Message-Id: <7FF78752-80EB-47CA-9E60-515607D3CFE5@yahoo.com> Date: Thu, 31 Oct 2024 12:17:17 -0700 To: Ed Maste , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3776.700.51) References: <7FF78752-80EB-47CA-9E60-515607D3CFE5.ref@yahoo.com> X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.205:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from] X-Rspamd-Queue-Id: 4XfYfN0H3Gz4HF6 X-Spamd-Bar: --- Ed Maste wrote on Date: Thu, 31 Oct 2024 18:35:59 UTC : > The branch main has been updated by emaste: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcf1aba2857c1ec59c9a34d363cb18a61= ffa34a10 >=20 > commit cf1aba2857c1ec59c9a34d363cb18a61ffa34a10 > Author: Ed Maste > AuthorDate: 2024-10-30 19:15:13 +0000 > Commit: Ed Maste > CommitDate: 2024-10-31 18:35:44 +0000 >=20 > freebsd-update: refuse to operate on a pkgbase system >=20 > FreeBSD-update is not compatible with packaged base. >=20 > PR: 282252 > Reviewed by: bapt, markj (earlier) > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D47341 > --- > usr.sbin/freebsd-update/freebsd-update.sh | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) >=20 > diff --git a/usr.sbin/freebsd-update/freebsd-update.sh = b/usr.sbin/freebsd-update/freebsd-update.sh > index 459d54db0c57..80a8bf288251 100644 > --- a/usr.sbin/freebsd-update/freebsd-update.sh > +++ b/usr.sbin/freebsd-update/freebsd-update.sh > @@ -1099,6 +1099,25 @@ IDS_check_params () { > fetch_setup_verboselevel > } >=20 > +# Packaged base and freebsd-update are incompatible. Exit with an = error if > +# packaged base is in use. > +check_pkgbase() > +{ > + # Packaged base requires that pkg is bootstrapped. > + if ! pkg -c ${BASEDIR} -N >/dev/null 2>/dev/null; then > + return > + fi > + # Presence of FreeBSD-* package(s) indicates packaged base. > + if ! pkg -c ${BASEDIR} info -q -x '^FreeBSD' 2>/dev/null; then Slight difference in the comment vs. the code's behavior? : Comment: FreeBSD-* Code: FreeBSD* Looks to me like possibly the code is not as intended ("-" required?). > + return > + fi > + cat < +FreeBSD-update is incompatible with the use of packaged base. Please = see > +https://wiki.freebsd.org/PkgBase for more information. > +EOF > + exit 1 > +} . . . =3D=3D=3D Mark Millard marklmi at yahoo.com