CVS commit: pkgsrc/mk/fetch

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Fri May 12 20:09:09 UTC 2023

Modified Files:
        pkgsrc/mk/fetch: github.mk

Log Message:
mk/fetch/github.mk: reject "main" as well as "master", and clarify

PR 57062 from Andrew Cagney


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mk/fetch/github.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/fetch/github.mk
diff -u pkgsrc/mk/fetch/github.mk:1.15 pkgsrc/mk/fetch/github.mk:1.16
--- pkgsrc/mk/fetch/github.mk:1.15      Sat Apr 10 09:03:13 2021
+++ pkgsrc/mk/fetch/github.mk   Fri May 12 20:09:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: github.mk,v 1.15 2021/04/10 09:03:13 nia Exp $
+# $NetBSD: github.mk,v 1.16 2023/05/12 20:09:09 dholland Exp $
 #
 # github.com master site handling
 #
@@ -45,8 +45,8 @@ PKG_FAIL_REASON+=     "MASTER_SITES must mat
 GITHUB_PROJECT?=       ${PKGBASE}
 GITHUB_TAG?=           ${PKGVERSION_NOREV}
 
-.  if !empty(GITHUB_TAG:Mmaster)
-PKG_FAIL_REASON+=      "master is not a valid tag name, use an explicit commit hash"
+.  if !empty(GITHUB_TAG:Mmaster) || !empty(GITHUB_TAG:Mmain)
+PKG_FAIL_REASON+=      "main (or master) is not a valid tag name; use an explicit commit hash or a tag, not a branch"
 .  endif
 
 .  if !defined(GITHUB_TYPE)