svn commit: r338214 - in head/ports-mgmt/poudriere-devel: . files
Bryan Drewery
bdrewery at FreeBSD.org
Tue Dec 31 02:20:00 UTC 2013
Author: bdrewery
Date: Tue Dec 31 02:19:59 2013
New Revision: 338214
URL: http://svnweb.freebsd.org/changeset/ports/338214
Log:
Add temporary workaround for hang during sanity check
Added:
head/ports-mgmt/poudriere-devel/files/
head/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh (contents, props changed)
Modified:
head/ports-mgmt/poudriere-devel/Makefile
Modified: head/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- head/ports-mgmt/poudriere-devel/Makefile Tue Dec 31 01:22:19 2013 (r338213)
+++ head/ports-mgmt/poudriere-devel/Makefile Tue Dec 31 02:19:59 2013 (r338214)
@@ -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
Added: head/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh Tue Dec 31 02:19:59 2013 (r338214)
@@ -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() {
More information about the svn-ports-head
mailing list