Date: Thu, 26 Jul 2018 10:37:36 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475360 - in head/Mk: . Scripts Message-ID: <201807261037.w6QAbaPu033570@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Jul 26 10:37:36 2018 New Revision: 475360 URL: https://svnweb.freebsd.org/changeset/ports/475360 Log: Tell people who disabled LICENSE processing that it then cannot be checked. Reported by: mfechner Approved by: bapt Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D16450 Modified: head/Mk/Scripts/qa.sh (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Thu Jul 26 09:44:41 2018 (r475359) +++ head/Mk/Scripts/qa.sh Thu Jul 26 10:37:36 2018 (r475360) @@ -918,7 +918,9 @@ license() { local lic autoaccept pkgmirror #distsell distmirror pkgsell - if [ -n "$LICENSE" ]; then + if [ -n "$DISABLE_LICENSES" ]; then + warn "You have disabled the licenses framework with DISABLE_LICENSES, unable to run checks" + elif [ -n "$LICENSE" ]; then for lic in $LICENSE_PERMS; do case "$lic" in auto-accept) autoaccept=1 ;; Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Jul 26 09:44:41 2018 (r475359) +++ head/Mk/bsd.port.mk Thu Jul 26 10:37:36 2018 (r475360) @@ -1633,6 +1633,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \ PKGBASE=${PKGBASE} \ LICENSE="${LICENSE}" \ LICENSE_PERMS="${_LICENSE_PERMS}" \ + DISABLE_LICENSES="${DISABLE_LICENSES:Dyes}" \ PORTNAME=${PORTNAME} \ NO_ARCH=${NO_ARCH} \ "NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807261037.w6QAbaPu033570>