diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-12-31 10:19:59 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-12-31 10:19:59 +0800 |
| commit | f02fa3e8e1c1108513fe3da859e86ec64b09491a (patch) | |
| tree | a1579a4f51339eb36f4517f4d10a419ab829fdd0 /ports-mgmt | |
| parent | 58a2f10e6dc659854676ed9bf44b43006436ef63 (diff) | |
| download | freebsd-ports-gnome-f02fa3e8e1c1108513fe3da859e86ec64b09491a.tar.gz freebsd-ports-gnome-f02fa3e8e1c1108513fe3da859e86ec64b09491a.tar.zst freebsd-ports-gnome-f02fa3e8e1c1108513fe3da859e86ec64b09491a.zip | |
Add temporary workaround for hang during sanity check
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/poudriere-devel/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh | 25 |
2 files changed, 26 insertions, 2 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 66fe0612fd98..b85944740cad 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= poudriere PORTVERSION= 3.0.99.20131230 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://fossil.etoilebsd.net/poudriere/tarball/ \ LOCAL/bdrewery/${PORTNAME}/ @@ -17,8 +18,6 @@ FSL_CHKIN= ae87e905f3 OPTIONS_DEFINE= ZSH -FORBIDDEN= sanity check issue being fixed - CONFLICTS_INSTALL= poudriere-[0-9]* USES= uidfix diff --git a/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh b/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh new file mode 100644 index 000000000000..18e574f84663 --- /dev/null +++ b/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh @@ -0,0 +1,25 @@ +--- ./src/share/poudriere/common.sh.orig 2013-12-30 15:33:59.000000000 -0600 ++++ ./src/share/poudriere/common.sh 2013-12-30 20:19:11.627128632 -0600 +@@ -2996,6 +2996,7 @@ + + parallel_run() { + local cmd="$1" ++ local ret=0 + shift 1 + + if [ ${NBPARALLEL} -eq ${PARALLEL_JOBS} ]; then +@@ -3008,11 +3009,13 @@ + _SHOULD_REAP=$((_SHOULD_REAP + 1)) + if [ ${_SHOULD_REAP} -eq 16 ]; then + _SHOULD_REAP=0 +- _reap_children || return $? ++ _reap_children || ret=$? + fi + + PARALLEL_CHILD=1 parallel_exec $cmd "$@" & + PARALLEL_PIDS="${PARALLEL_PIDS} $! " ++ ++ return ${ret} + } + + find_all_pool_references() { |