Check-in [511d3ad7a2]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix error when no pkg-{install,message} exists
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:511d3ad7a296e1febca88fa1de1216fa1f313be4
User & Date: bdrewery 2012-06-19 04:24:15
Context
2012-06-19
05:09
Avoid subshell in sh(1) by using {} check-in: 332ad0dc2d user: bdrewery tags: trunk
04:24
Fix error when no pkg-{install,message} exists check-in: 511d3ad7a2 user: bdrewery tags: trunk
2012-06-18
05:43
use compact test syntax wrap long lines return by default returns 0 ECHO_CMD defined as sh builtin and always return 0, therefore change && to ;

Submitted by: Alex Kozlov (ak@) check-in: 408c12ee83 user: bapt tags: trunk

Changes

Changes to ports/Mk/bsd.stage.mk.

    22     22   sync-from-stage: stage
    23     23   .if defined(WITH_PKGNG)
    24     24   	@${DO_NADA}
    25     25   .else
    26     26   	@${ECHO_MSG} "===> Syncing from stagedir"
    27     27   	@${SH} ${PORTSDIR}/Tools/scripts/sync_from_stage.sh -f ${STAGEDIR} \
    28     28   		-p ${TMPPLIST} -P ${PREFIX} -w ${WRKDIR}
    29         -	@[ -f ${PKGINSTALL} ] && ${SH} ${PKGINSTALL} POST-INSTALL
    30         -	@[ -f ${PKGMESSAGE} ] && ${CAT} ${PKGMESSAGE} || return
           29  +	@[ -f ${PKGINSTALL} ] && ${SH} ${PKGINSTALL} POST-INSTALL || true
           30  +	@[ -f ${PKGMESSAGE} ] && ${CAT} ${PKGMESSAGE} || true
    31     31   .endif
    32     32   .endif
    33     33   
    34     34   .if !target(genplist)
    35     35   genplist: stage
    36     36   	@(${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}) | ${TAR} tf - | \
    37     37   		awk '{ sub(/^\.$$/, "", $$1); \