Date: Tue, 7 Feb 2012 18:53:18 GMT From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/164870: [PATCH] bsd.licenses.mk Set IGNORE if BATCH is set and LICENSE_PERMS= no-auto-accept Message-ID: <201202071853.q17IrIsY048533@pegasus.bayofrum.net> Resent-Message-ID: <201202071930.q17JUCU3046668@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164870 >Category: ports >Synopsis: [PATCH] bsd.licenses.mk Set IGNORE if BATCH is set and LICENSE_PERMS= no-auto-accept >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Feb 07 19:30:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sat Jan 28 15:45:27 GMT 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64 Pointyhat gets sad if I commit a port with a license that needs accepting. http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/a.7.20120205121625/adom-1.1.1_2.log Patch attached sets IGNORE instead of using ECHO_MSG and EXIT, so means the port is a DUD rather than a build failure. >Description: >How-To-Repeat: >Fix: --- patch.txt begins here --- ? patch.txt Index: bsd.licenses.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.licenses.mk,v retrieving revision 1.9 diff -u -r1.9 bsd.licenses.mk --- bsd.licenses.mk 9 Jan 2012 15:31:27 -0000 1.9 +++ bsd.licenses.mk 7 Feb 2012 18:50:12 -0000 @@ -548,27 +548,26 @@ # Check variables are correctly defined and print status up to here +.if ${_LICENSE_STATUS} == "ask" && defined(BATCH) +IGNORE= License ${_LICENSE} needs confirmation, but BATCH is defined +.endif + check-license: .if defined(_LICENSE_ERROR) @${ECHO_MSG} "===> License not correctly defined: ${_LICENSE_ERROR}" @exit 1 .endif -. if ${_LICENSE_STATUS} == "rejected" +.if ${_LICENSE_STATUS} == "rejected" @${ECHO_MSG} "===> License ${_LICENSE} rejected by the user" @${ECHO_MSG} @${ECHO_MSG} "If you want to install this port make sure the following license(s) are not present in LICENSES_REJECTED, either in make arguments or /etc/make.conf: ${_LICENSE}. Also check LICENSES_GROUPS_REJECTED in case they contain a group this license(s) belong to." | ${FMT} @${ECHO_MSG} @exit 1 -. elif ${_LICENSE_STATUS} == "accepted" +.elif ${_LICENSE_STATUS} == "accepted" @${ECHO_MSG} "===> License ${_LICENSE} accepted by the user" -. elif ${_LICENSE_STATUS} == "ask" -. if defined(BATCH) - @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, but BATCH is defined" - @exit 1 -. else +.elif ${_LICENSE_STATUS} == "ask" @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, will ask later" -. endif -. endif +.endif # Display, ask and save preference if requested --- patch.txt ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202071853.q17IrIsY048533>