From nobody Fri Oct 09 15:10:16 2026 X-Original-To: dev-commits-src-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 4j1VfK01rYz6vc3m for ; Fri, 09 Oct 2026 15:10:16 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1VfJ6ZVdz4T7t for ; Fri, 09 Oct 2026 15:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791558616; 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=XZRnN+azLul9eIR8EJJyoxJ8PooSnlvOK4ssEs2VubE=; b=QT21kk4x+SMhupLjgDuoPh4CBiPcF6tJv+ljbnAGwnQnnVY8v63emWq0mgX4HjMgwxY39T FGKYMSBT2RhylW9oyZjePlI/w4ILf5i8IcsUe705OK2Hy1ZBIdzF1ELvCBuKuwWNSz9+mn AQlWm+T7vBmeBTd6ld4Oirt2UWkTP9qU2zK9G+KKXhjyVoyE1NFpxlAFDZKLZIfO1bmFGa YiqccYlLJzTiMeYoJEDPq+UBz7UoB/OjUoXLkqTPK/LDD9eB6iF1MGlRxqZT1M8ugiWnH6 /OhjqZWsw8Z0Ql3D79T+BeuReQ846bRt/LAFqhurU7lHcBW/WLflqM/2rDHYag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791558616; b=WuWvIgxuSUJkqhmhl/2NKOT3iGH9QmITkfYt4xcymJGxgsPgwW2MJy9QH/lq/amtMUjYEH HBFj1lTt12Ckag7WXLKI9/35EM4BqHcfLmKy9eW6ZE0fC+BNhn2Sq0uCdBLGKSuMLGrrVL G0DudRlrYgl42YsIVQPOnv3vpwR4F0rdd44anzmhZe5qveBEnXNdBKTAuwP406U9Uq+MSN eLInjKR96NZAvT/9DmQSC17lwZWRfX0UavI1iz3nRuVT9LybVhd7/1rF+rCcNZcMvbWCvQ b7dqwmB+aJbnEwZoRb50m+TK8uyvDXPNtmMqPXoo4xdGN/17v4GbafnEvakdmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791558616; 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=XZRnN+azLul9eIR8EJJyoxJ8PooSnlvOK4ssEs2VubE=; b=PldISaz3vJASmqQO22toKyvFcv9uJBhiaPgkXm2KQ6k3SXPwORVXee6K1MmQx8uL+elpxH N4BmDQ6tV/I6IZzcRG5bxWJl9FeoB1HM7N4bB5Ehq5akEF0cSWtzvswStET4k76RNgrnIY yC+9Y6vBFVyU8tkj4N23tJjo3uee0LJOiOoAIhKbXOg+/mLqEawMhHvY9IlT4T4csIk11U jsr0kx46Wyjqv9Dj6YbhF984ZQHkuIruLLob11OP1vR41rJu7jGA4ODZAqofKNwpUBySVJ 9EKSz2s9Utxc2akIVqZqU8OsWeGof+pUMLn+SAKwyPE/coj0Bc3Xcf5HpWgRXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j1VfJ5LkCzG8q for ; Fri, 09 Oct 2026 15:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b6ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 15:10:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d3c788feec4c - main - Makefile.inc1: Don't unnecessarily ignore rm errors List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3c788feec4cbe0854dc6f72e2166c0423a7c118 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 15:10:16 +0000 Message-Id: <6ac903d8.3b6ae.51c0d6a9@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c788feec4cbe0854dc6f72e2166c0423a7c118 commit d3c788feec4cbe0854dc6f72e2166c0423a7c118 Author: Ed Maste AuthorDate: 2024-08-19 16:03:13 +0000 Commit: Ed Maste CommitDate: 2026-10-09 15:06:46 +0000 Makefile.inc1: Don't unnecessarily ignore rm errors For rm -f it's not an error if the files do not exist. If there's any other error it's presumably a real issue, so avoid ignoring all errors. Reviewed by: brooks, adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56714 --- Makefile.inc1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6a228a29ed5d..7251deb11bdd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2119,7 +2119,7 @@ update-packages: .PHONY package-pkg: _pkgbootstrap _repodir .PHONY .if defined(INCLUDE_PKG_IN_PKGBASE_REPO) .if exists(${PORTSDIR}) - rm -rf /tmp/ports.${TARGET} || : + rm -rf /tmp/ports.${TARGET} env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ WSTAGEDIR=${WSTAGEDIR} \ @@ -2215,7 +2215,7 @@ create-packages-source: _pkgbootstrap _repodir .PHONY create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source package-pkg create-packages-sets create-source-src-package: _pkgbootstrap .PHONY - rm -f ${SSTAGEDIR}/src.plist 2>/dev/null || : + rm -f ${SSTAGEDIR}/src.plist .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ @@ -2241,7 +2241,7 @@ create-source-src-package: _pkgbootstrap .PHONY .endif create-source-src-sys-package: _pkgbootstrap .PHONY - rm -f ${SSTAGEDIR}/src-sys.plist 2>/dev/null || : + rm -f ${SSTAGEDIR}/src-sys.plist .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ @@ -2269,7 +2269,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY create-source-packages: .PHONY _pkgbootstrap create-source-src-package create-source-src-sys-package create-world-packages: _pkgbootstrap .PHONY - @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : + @rm -f ${WSTAGEDIR}/*.plist @cd ${WSTAGEDIR} ; \ ${METALOG_SORT_CMD} ${WSTAGEDIR}/${DISTDIR}/METALOG | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk