From nobody Wed Dec 14 05:12:49 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NX3Qn55jyz4kqmV; Wed, 14 Dec 2022 05:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NX3Qn4Q23z3KsP; Wed, 14 Dec 2022 05:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670994769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VdVhYSjcxMRwCHXpePkcigtVZgsHJ/ucXcKh5HBV51E=; b=GmcLKmJCj++cJth5ExAowJMBAcXmEU8Glt4Xp4ciZNYyzvIGI4aek3QceUsQ5KUFroJgAD Gbwot4EBLBncWIbua+zNg74cwZyTRNbMk4zX5c1B7zcRZu39KFztDax3+wRy0stNvmBf0D J/sq/Jl/aJvy2wGS+qEDPm2h3XMeuqY0ReEYm1xajtAVO8SR5DWwpIueDX8FKp6NzN6NY0 yfh04tKZ3PGT5LLbGzn7Tz0UdBXxM7Cvm3PVYRE8DF1qzQRMTnQUcKnJSng4Z2wOJadrOX de/k8hVyAmEa8Yh9msVPU641/cM2cXJf3FKk5ibLB0hRGkiHIcOgWRA76kHLyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670994769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VdVhYSjcxMRwCHXpePkcigtVZgsHJ/ucXcKh5HBV51E=; b=N2xY4kzi0+RzKqy5KAgIDKSE/+HywromId4Unj7Tpbv1zU80Jgy4uVztwB3KRFmFkFDa6c 2vEtyPKQpi/b0DrMGIprz6nAyy5OWG2ywcnEdpB54zhWjg7jHgi/wleYq//5U4TZiHeSSK 6/MD5IQITVFMpeu4wqf27m57kQ6D7otdEKJzUzyP77UMpjFN3ZJdJOyGZhailyNVq3B4j2 pHFhbMByyQXIJr4QIYl8aS3+nrkixS2lJmCzsIVm72RQnTaivGujESAiUB7YTdCIqHE9yc 0Fnt4sCg9XGiv5WOYQW5QgFfA7T6upiwuiRrcCQDzHDsW121fXRlpXeBl45gig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670994769; a=rsa-sha256; cv=none; b=SkpM0Fx1RX+HjbfsNAyfvXrJFtufuVEmzHCcLoaEV3hs6FKM0ktRLiANKizvoNVAhhABTj afEMmy//XnerFGCR56y3P3UQF16q6OhFRTn+J/av0QHOBWylbSvyYLWdK9CgJNXB+3/HTQ 78VjtG1Dv3v7k8nepJQsuv+L7cCqR9a+0ro0oT6e0FsQ9jPDhgqpqcsAE05xOzbzsu4TN9 WBwwkHJlCzrD6LRF2dzizhMg/ARxF+KdWEijEfLD3LtmGC62eBKRUko0YDF84DMT6OHViL BcePzngRy/39YHLMJDwrYepZGO9WBgGyKt2neOhWKbN36/z7PnYs3ch8KpoyxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NX3Qn3RJHzhWx; Wed, 14 Dec 2022 05:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BE5Cncl091117; Wed, 14 Dec 2022 05:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BE5CnEp091116; Wed, 14 Dec 2022 05:12:49 GMT (envelope-from git) Date: Wed, 14 Dec 2022 05:12:49 GMT Message-Id: <202212140512.2BE5CnEp091116@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: f0191973eadf - main - Mk/Scripts: Fix potential error creating .metadir/+DESC List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0191973eadf9d52e3c32d5f430fa4f2d083fde6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=f0191973eadf9d52e3c32d5f430fa4f2d083fde6 commit f0191973eadf9d52e3c32d5f430fa4f2d083fde6 Author: Bryan Drewery AuthorDate: 2022-12-14 05:05:30 +0000 Commit: Bryan Drewery CommitDate: 2022-12-14 05:11:01 +0000 Mk/Scripts: Fix potential error creating .metadir/+DESC In some builds it could be possible that pkg-descr is not writable. We could either install -m 0644 the file over or just let sh create it. This change also opens the destination file only once now. Fixes: ddd0e820c --- Mk/Scripts/create-manifest.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh index 2f68f0e9d436..c6d0ef559195 100644 --- a/Mk/Scripts/create-manifest.sh +++ b/Mk/Scripts/create-manifest.sh @@ -86,13 +86,15 @@ if [ -n "${dp_PKG_NOTES}" ]; then fi # Copy the pkg-descr file -cp ${dp_DESCR} ${dp_METADIR}/+DESC -if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then - echo >> ${dp_METADIR}/+DESC - for www in ${dp_WWW}; do - echo "WWW: ${www}" >> ${dp_METADIR}/+DESC - done -fi +{ + cat ${dp_DESCR} + if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then + echo + for www in ${dp_WWW}; do + echo "WWW: ${www}" + done + fi +} > ${dp_METADIR}/+DESC # Concatenate all the scripts output_files=