cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better check for PREPARE_CHECK_ONLY: assume we're second_pass already in

Browse Source 
the check_install case.
That way, we get the full error report.
This commit is contained in:
espie 2011-11-21 12:20:53 +00:00
parent eba34186b3
commit f5458c8a3e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1137 2011/11/21 12:16:42 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.1138 2011/11/21 12:20:53 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -1894,6 +1894,10 @@ ${WRKDIR}/.dep-${_i:C,>=,ge-,g:C,<=,le-,g:C,<,lt-,g:C,>,gt-,g:C,\*,ANY,g:C,[|:/=
h="===> ${FULLPKGNAME${SUBPACKAGE}}${_MASTER} depends on: $$pkg -"; \ h="===> ${FULLPKGNAME${SUBPACKAGE}}${_MASTER} depends on: $$pkg -"; \
for second_pass in false true; do \ for second_pass in false true; do \
if $$check_install; then \ if $$check_install; then \
case ${PREPARE_CHECK_ONLY:L} in \
yes) \
second_pass=true;; \
esac; \
${_force_update_fragment}; \ ${_force_update_fragment}; \
if ${PKG_INFO} ${PKGDB_LOCK} -q -e "$$pkg" -r "$$pkg" $$default; then \ if ${PKG_INFO} ${PKGDB_LOCK} -q -e "$$pkg" -r "$$pkg" $$default; then \
${ECHO_MSG} "$$h found"; \ ${ECHO_MSG} "$$h found"; \
@ -1901,11 +1905,6 @@ ${WRKDIR}/.dep-${_i:C,>=,ge-,g:C,<=,le-,g:C,<,lt-,g:C,>,gt-,g:C,\*,ANY,g:C,[|:/=
else \ else \
${ECHO_MSG} "$$h not found"; \ ${ECHO_MSG} "$$h not found"; \
${ECHO_MSG} " (or $$default does not match)"; \ ${ECHO_MSG} " (or $$default does not match)"; \
case ${PREPARE_CHECK_ONLY:L} in \
yes) \
${REPORT_PROBLEM}; \
exit 1;; \
esac; \
fi; \ fi; \
else \ else \
if ! ${PKG_INFO} ${PKGDB_LOCK} -q -r "$$pkg" $$default; \ if ! ${PKG_INFO} ${PKGDB_LOCK} -q -r "$$pkg" $$default; \