Attachment 168454 Details for Bug 208180 – patch

[patch] patch

license-dialog.patch (text/plain), 978 bytes, created by Tijl Coosemans on 2016-03-21 13:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-03-21 13:56:22 UTC

Size: 978 bytes

patch

obsolete

>Index: Mk/bsd.licenses.mk
>===================================================================
>--- Mk/bsd.licenses.mk	(revision 411272)
>+++ Mk/bsd.licenses.mk	(working copy)
>@@ -611,17 +611,9 @@ ${_LICENSE_COOKIE}:
> .	if !defined(NO_LICENSES_DIALOGS)
> # Dialog interface
> .		if ${_LICENSE_COMB} == "single"
>-	@trap '${RM} -f $$tmpfile' EXIT INT TERM; \
>-	tmpfile=$$(mktemp -t portlicenses); \
>-	while true; do \
>-		${DIALOG} --menu "License for ${PKGNAME} (${_LICENSE})" 21 70 15 accept "Accept license" reject "Reject license" view "View license" 2>"$${tmpfile}"; \
>-		result=`${CAT} $${tmpfile}`; \
>-		case $${result} in \
>-		accept) break ;; \
>-		reject) exit 1;; \
>-		view)   ${DIALOG} --textbox "${_LICENSE_FILE}" 21 75 ;; \
>-		esac; \
>-	done
>+	${DIALOG} --title "License for ${PKGNAME} (${_LICENSE})" \
>+		--yes-label Accept --no-label Reject --yesno \
>+		"$$(${CAT} ${_LICENSE_FILE})" 21 76 || exit 1
> 
> .		elif ${_LICENSE_COMB} == "dual"
> 	@${RM} -f ${_LICENSE_ASK_DATA}

Actions: View | Diff

Attachments on bug 208180: 168454 | 168455