From owner-dev-commits-src-all@freebsd.org Sun Oct 3 05:15:44 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 302D96B0A78; Sun, 3 Oct 2021 05:15:44 +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 4HMX9r0jMnz4RQ8; Sun, 3 Oct 2021 05:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ED3EA2046B; Sun, 3 Oct 2021 05:15:43 +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 1935Fhpn008806; Sun, 3 Oct 2021 05:15:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1935FhYf008805; Sun, 3 Oct 2021 05:15:43 GMT (envelope-from git) Date: Sun, 3 Oct 2021 05:15:43 GMT Message-Id: <202110030515.1935FhYf008805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 996c4186aa7b - stable/13 - makesyscalls: stop trying to remove . and .. in cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 996c4186aa7bd212dec8cd40829533c7e395bab6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2021 05:15:44 -0000 The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=996c4186aa7bd212dec8cd40829533c7e395bab6 commit 996c4186aa7bd212dec8cd40829533c7e395bab6 Author: Kyle Evans AuthorDate: 2021-01-27 17:46:15 +0000 Commit: Kyle Evans CommitDate: 2021-10-03 05:14:54 +0000 makesyscalls: stop trying to remove . and .. in cleanup lfs.dir() will include these entries, but os.remove() cannot remove them for obvious reasons. (cherry picked from commit 340e009ecc00e5e74d58920ca909968dc7e88af1) --- sys/tools/makesyscalls.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index acae55050752..0ff4d53f924b 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -100,7 +100,9 @@ local function cleanup() if cleantmp then if lfs.dir(tmpspace) then for fname in lfs.dir(tmpspace) do - os.remove(tmpspace .. "/" .. fname) + if fname ~= "." and fname ~= ".." then + os.remove(tmpspace .. "/" .. fname)) + end end end