diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-02-13 04:57:22 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-02-13 04:57:22 +0000 |
| commit | 7674aff6decf7a60041cff495a8780a19359971f (patch) | |
| tree | ba5a6bae2cf2a1083c5bd51f4a6374b5c65129f3 /ports-mgmt/poudriere-devel | |
| parent | 937543bc858191606a370589ffcba6de398a19bf (diff) | |
| download | ports-7674aff6decf7a60041cff495a8780a19359971f.tar.gz ports-7674aff6decf7a60041cff495a8780a19359971f.zip | |
HTML: Hide harmless shared lock failures
Notes
Notes:
svn path=/head/; revision=461685
Diffstat (limited to 'ports-mgmt/poudriere-devel')
| -rw-r--r-- | ports-mgmt/poudriere-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 5922a91b294e..eb01acff201b 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -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}/ \ diff --git a/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh b/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh new file mode 100644 index 000000000000..15da9e9dcc26 --- /dev/null +++ b/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh @@ -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}" |