svn commit: r322619 - head/Mk

Baptiste Daroussin bapt at FreeBSD.org
Wed Jul 10 06:44:20 UTC 2013


Author: bapt
Date: Wed Jul 10 06:44:19 2013
New Revision: 322619
URL: http://svnweb.freebsd.org/changeset/ports/322619

Log:
  Error message when not able to create the optiondir directory.
  optiondir being defined in a subshell wasn't defined when the error message is printed.
  
  PR:		ports/176849
  Submitted by:	Oleg Ginzburg <olevole at olevole.ru>

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jul 10 06:33:41 2013	(r322618)
+++ head/Mk/bsd.port.mk	Wed Jul 10 06:44:19 2013	(r322619)
@@ -6091,14 +6091,14 @@ do-config:
 		(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \
 	${ECHO_MSG} "===>  Returning to user credentials"
 .else
-	@(optionsdir=${OPTIONS_FILE}; optionsdir=$${optionsdir%/*}; \
+	@optionsdir=${OPTIONS_FILE}; optionsdir=$${optionsdir%/*}; \
 	oldoptionsdir=${OPTIONSFILE}; oldoptionsdir=$${oldoptionsdir%/*}; \
 	if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then \
 		${MV} $${oldoptionsdir} $${optionsdir}; \
 	elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then \
 		${RM} -rf $${oldoptionsdir} ; \
 	fi ; \
-	${MKDIR} $${optionsdir} 2> /dev/null) || \
+	${MKDIR} $${optionsdir} 2> /dev/null || \
 	(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1)
 .endif
 	@TMPOPTIONSFILE=$$(mktemp -t portoptions); \


More information about the svn-ports-all mailing list