Date: Thu, 19 Sep 2024 14:50:26 +0200 From: Mathieu Arnold <mat@freebsd.org> To: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 06790548d500 - main - Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault Message-ID: <3vukih75nbcwsoimkbm6c2apwfg6pggytz3vmghxairyaxnhe3@5dnyba45gxps> In-Reply-To: <202409191246.48JCkuU8064953@gitrepo.freebsd.org> References: <202409191246.48JCkuU8064953@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--sb56tbrkzsudtz2c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Sorry about the mess, I redid the commit with correct attribution and PR number. On Thu, Sep 19, 2024 at 12:46:56PM GMT, Mathieu Arnold wrote: > The branch main has been updated by mat: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D06790548d50075cc2e2cfff4= fe0811a561402cec >=20 > commit 06790548d50075cc2e2cfff4fe0811a561402cec > Author: Mathieu Arnold <mat@FreeBSD.org> > AuthorDate: 2024-09-19 12:26:24 +0000 > Commit: Mathieu Arnold <mat@FreeBSD.org> > CommitDate: 2024-09-19 12:46:35 +0000 >=20 > Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=3Dnodef= ault > =20 > When using USE_GITHUB=3Dnodefault, we don't need to add GH to > MASTER_SITES, as the github urls that are needed will be added later. > =20 > Adding GH here means we'll add a generic GitHub URL to the fetch list, > in the form of github.com/<portname>/<portname>/.../<dist> which will > not work. When used with USE_GITLAB the framework will add this bogus > URL before the correct gitlab url. It does not prevent the distfile to > be fetched from gitlab, but it makes everyone try and fetch from a bo= gus > url before trying the correct url. > --- > Mk/bsd.sites.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk > index e34fbb846144..5fffe2e64865 100644 > --- a/Mk/bsd.sites.mk > +++ b/Mk/bsd.sites.mk > @@ -294,7 +294,7 @@ GH_SUBDIR+=3D ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((= :[^:/]*)?)((/.*)?)@\6\4@:M/*: > MASTER_SITE_GITHUB+=3D https://codeload.github.com/%SUBDIR% > MASTER_SITE_GITHUB_CLOUD+=3D https://cloud.github.com/downloads/%SUBDIR% > =20 > -. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITE= S:MGHC} && !${USE_GITHUB:Mnodefault} > +. if ( !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SI= TES:MGHC} ) && !${USE_GITHUB:Mnodefault} > MASTER_SITES+=3D GH > . endif > GH_ACCOUNT_DEFAULT=3D ${PORTNAME} --=20 Mathieu Arnold --sb56tbrkzsudtz2c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmbsHhJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb68Rgv/Y9RkeAd2OuQKdKmJ3qE0wxTimYcXfGaRPww+JkjYfkxwbYQhXAPefgAI Dm/uJthoPiaUWRKy1qqHNGV1rjLgm6FQYcG8fm5RiSkHytvoamXSvOWftYyjwiJi jY2n3Z01+LvhMBpX+kS4UVIVTsIl+kjlHmhcsnUiyc7fY6lrhTFnQm/AmdCrYcZ/ 8Fj5oS1VXhFCIm+Z/CrAl9bNrKRBjQK5E0GxAGijvazfHnXJf0KBRlPGgmgBW/IR Lc7jebqYnojdFYYWlAkIpKrgttp4mPMdOc2E8e9W96MywCIyYWEUsN9YD+dwkWaA nQskS0w6a+j3d41sMRBM3VHulxIJDEscJ+hiV0/KdW/03Dax60UC6JYi/DXkS9zA VxlODZye3JuecMr8aD/YC4jlpDT4fNVoJZoTFB1XKC4a5RF31ZEXjvxbx8Q0eOEi 882+F0Vyg04ZW9qlpwwByegqemXXzuHuTD69s+v2V0SyeXV2O+edjb+F7A9ooJ5B OH1AVHxv =dDm9 -----END PGP SIGNATURE----- --sb56tbrkzsudtz2c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3vukih75nbcwsoimkbm6c2apwfg6pggytz3vmghxairyaxnhe3>