Date: Thu, 19 Sep 2024 12:49:10 GMT From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 067905614d64 - main - Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault Message-ID: <202409191249.48JCnAJb065736@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=067905614d641e8a3fa3af3aa2d02b04a28b7185 commit 067905614d641e8a3fa3af3aa2d02b04a28b7185 Author: Brad Davis <brd@FreeBSD.org> AuthorDate: 2024-09-19 12:26:24 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2024-09-19 12:48:25 +0000 Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault When using USE_GITHUB=nodefault, we don't need to add GH to MASTER_SITES, as the github urls that are needed will be added later. 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 bogus url before trying the correct url. PR: 279816 --- Mk/bsd.sites.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\6\4@:M/*: MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR% MASTER_SITE_GITHUB_CLOUD+= https://cloud.github.com/downloads/%SUBDIR% -. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault} +. if ( !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} ) && !${USE_GITHUB:Mnodefault} MASTER_SITES+= GH . endif GH_ACCOUNT_DEFAULT= ${PORTNAME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409191249.48JCnAJb065736>