Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Feb 2018 04:57:22 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461685 - in head/ports-mgmt/poudriere-devel: . files
Message-ID:  <201802130457.w1D4vMC5016441@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Feb 13 04:57:22 2018
New Revision: 461685
URL: https://svnweb.freebsd.org/changeset/ports/461685

Log:
  HTML: Hide harmless shared lock failures

Added:
  head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.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 Feb 13 04:37:41 2018	(r461684)
+++ head/ports-mgmt/poudriere-devel/Makefile	Tue Feb 13 04:57:22 2018	(r461685)
@@ -2,7 +2,7 @@
 
 PORTNAME=	poudriere
 DISTVERSION=	3.2.99.20180202
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Added: head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh	Tue Feb 13 04:57:22 2018	(r461685)
@@ -0,0 +1,33 @@
+commit 8f9fdcc9691dcb6ab3619bbced22beb108bfcbb1
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Sat Feb 3 16:39:51 2018 -0800
+
+    HTML: Hide harmless shared lock failures
+
+diff --git src/share/poudriere/include/html.sh src/share/poudriere/include/html.sh
+index c56cb6520..98bcd84f4 100644
+--- src/share/poudriere/include/html.sh
++++ src/share/poudriere/include/html.sh
+@@ -78,11 +78,11 @@ html_json_main() {
+ build_all_json() {
+ 	critical_start
+ 	build_json
+-	if slock_acquire "json_jail_${MASTERNAME}"; then
++	if slock_acquire "json_jail_${MASTERNAME}" 2>/dev/null; then
+ 		build_jail_json
+ 		slock_release "json_jail_${MASTERNAME}"
+ 	fi
+-	if slock_acquire "json_top"; then
++	if slock_acquire "json_top" 2>/dev/null; then
+ 		build_top_json
+ 		slock_release "json_top"
+ 	fi
+@@ -173,7 +173,7 @@ install_html_files() {
+ 	local base="$2"
+ 	local dest="$3"
+ 
+-	slock_acquire html_base || return 0
++	slock_acquire html_base 2>/dev/null || return 0
+ 
+ 	# Update the base copy
+ 	mkdir -p "${base}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802130457.w1D4vMC5016441>