Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Aug 2006 17:07:17 +0100
From:      Shaun Amott <shaun@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/102100: [PATCH] bsd.port.mk: Add some quotes in 'missing' target (improve handling of duplicate origins)
Message-ID:  <1155658037.21789@charon.picobyte.net>
Resent-Message-ID: <200608151610.k7FGAL4b038899@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         102100
>Category:       ports
>Synopsis:       [PATCH] bsd.port.mk: Add some quotes in 'missing' target (improve handling of duplicate origins)
>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 Aug 15 16:10:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:

>Description:

In the event there are multiple ORIGINs recorded for a particular
dependency, 'make missing' will spit out an error. This is non-critical,
and an unlikely scenario, but the handling of this situation could be
improved by adding some quotes, as below.

>How-To-Repeat:

charon# pkg_info -qO devel/libtool15
libtool-1.5.22_1
libtool-1.5.22_2

charon# make missing
lang/php5
devel/php5-pcre
textproc/php5-xml
[: libtool-1.5.22_1: unexpected operator

>Fix:

--- bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.540
diff -u -r1.540 bsd.port.mk
--- bsd.port.mk	14 Aug 2006 13:24:18 -0000	1.540
+++ bsd.port.mk	15 Aug 2006 16:00:46 -0000
@@ -5190,7 +5190,7 @@
 	@for dir in $$(${ALL-DEPENDS-LIST}); do \
 		THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \
 		installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \
-		if [ -z $$installed ]; then \
+		if [ -z "$$installed" ]; then \
 			${ECHO_CMD} $$THISORIGIN; \
 		fi \
 	done
--- bsd.port.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?1155658037.21789>