Date: Thu, 9 Dec 2010 12:48:09 -0500 (EST) From: Greg Larkin <glarkin@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152964: [UPDATE] Display the license name in informatinal messages Message-ID: <201012091748.oB9Hm836055767@fbsd70.entropy.prv> Resent-Message-ID: <201012091820.oB9IKAQp006882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152964 >Category: ports >Synopsis: [UPDATE] Display the license name in informatinal messages >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 09 18:20:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Greg Larkin >Release: FreeBSD 7.0-RELEASE i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD fbsd70.entropy.prv 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: While testing a PR that included adding a new license type, I wanted to see the new license name displayed during the tinderbox build to verify that it had been added to the license database correctly. This simple patch displays the license name in various informational messages presented to the user. >How-To-Repeat: Apply the patch and build any port that has LICENSE defined. Example output: http://people.freebsd.org/~glarkin/logs/pecl-drizzle-0.4.2.log >Fix: --- bsd.licenses.mk.diff begins here --- --- bsd.licenses.mk.orig 2010-12-09 11:21:13.000000000 -0500 +++ bsd.licenses.mk 2010-12-09 11:22:57.000000000 -0500 @@ -551,19 +551,19 @@ @exit 1 .endif . if ${_LICENSE_STATUS} == "rejected" - @${ECHO_MSG} "===> License rejected by the user" + @${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" - @${ECHO_MSG} "===> License accepted by the user" + @${ECHO_MSG} "===> License ${_LICENSE} accepted by the user" . elif ${_LICENSE_STATUS} == "ask" . if defined(BATCH) - @${ECHO_MSG} "===> License needs confirmation, but BATCH is defined" + @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, but BATCH is defined" @exit 1 . else - @${ECHO_MSG} "===> License needs confirmation, will ask later" + @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, will ask later" . endif . endif --- bsd.licenses.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012091748.oB9Hm836055767>