From owner-svn-ports-all@freebsd.org Tue Feb 13 04:57:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E7C8F2077F; Tue, 13 Feb 2018 04:57:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3B10383E28; Tue, 13 Feb 2018 04:57:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 305AE1C2D8; Tue, 13 Feb 2018 04:57:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1D4vNo1016443; Tue, 13 Feb 2018 04:57:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1D4vMC5016441; Tue, 13 Feb 2018 04:57:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201802130457.w1D4vMC5016441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 13 Feb 2018 04:57:22 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/ports-mgmt/poudriere-devel: . files X-SVN-Commit-Revision: 461685 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 04:57:23 -0000 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 +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}"