From nobody Tue Apr 16 20:13:28 2024 X-Original-To: dev-commits-src-all@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 4VJwGJ70FRz5H0lG; Tue, 16 Apr 2024 20:13:28 +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 4VJwGJ5vP2z4vSc; Tue, 16 Apr 2024 20:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298408; 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=KOCZtlR+jEwfySfTHbSUzAI19j5uUob4dPRg6rIzwBE=; b=u+RwYRPVbyS6GtQtex3xvznmcaiEqCzJgWhdewRqvFCSiy9hnn/2gr6zuE3jnsS6U2TDhL k5teyk3RFVUZs1wXCzsOUFTmL9xkJZr9qblNoeoIbfnPe68/rrCEbgMYdiB6707sVmlQhI i1xZq2vIKaKipjPSjNL/KcAU0qnNmi1CC59Bx06tkkbkjOb+/DhBnGcCNOwgQuWugzBJfh HsDtsB8ZfJcowCGWbCcUqcp8yGP1drxVBMEeRgSqIf+OM+jeT0/BPEkJwNYheG7Isy1RFI ey3cocXj0KhrPKnx+ExSJ4PL9DjRhRy96ateRcn8kvqm1KyqrjBoazmpXrU7Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298408; a=rsa-sha256; cv=none; b=CngGYwRrGi7wxljYzx2B0pifi4nAXWgxlpNAawr1bklXo/55G8RvQO4dqn3VI1L5vsLzdh Aus0N/9bKp4PqRWrHQsOtB0QsPFCaie/0y1fi4NBJYw3v1QGEsGZ9bAkFNVuIPgvk1hEnx NfzD4HnyDOqvfTuDQJbxirJ1NB2Re6kbkrLz8pUyUNiOH9vaS8hgid4L1qu1raxKCkowzF icXJSf+giZiNSYWH9nRJx8OiRKlhd1JGRbdzQ8jFU3cR/sQ74J8jjMH5817tW1BACn+CaQ p0qxYXITZUAL90jQX3hTGL95CsyFLGebL03jFF0qyau8nHa0lauhR/BtLzAI0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298408; 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=KOCZtlR+jEwfySfTHbSUzAI19j5uUob4dPRg6rIzwBE=; b=lPWYKFUWUUofIbNWV6q8KbmYYdqG3Az1sJlyhd1XX9B9tiGA9xqb4Z318nzCke6f+7JfiG EESIl7HUqwF3GHHhE3rcmHpfUb02hhodYDx/Le8vtDiPN2NLnx2kA6dBf+N3TWptdLkEnJ +oFs4gj95K/uVWv0FeqZ/4U9qk0VANv/aJh8/5G55Ntv+eqM4ppz8O1p8GReYcBxVc0Qnq AdBtJo6eZSbOSrb/uI2aiCiD+ygNtJefZ8A/ysz9sKnHdKEMNOKkytkVpLJdTO+K+Oa/9b X0fsiI3/8eDRZXqCDctQKq3qGWYvrX7QalFQVsx1ujDtf4qpMGjXSKdJ2qhnHA== 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 4VJwGJ5WjDzxWY; Tue, 16 Apr 2024 20:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDSlR039657; Tue, 16 Apr 2024 20:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDSbw039654; Tue, 16 Apr 2024 20:13:28 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:28 GMT Message-Id: <202404162013.43GKDSbw039654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 216c56ff1df6 - stable/14 - loader/lua: Remove compat shim for loader.lua_path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 216c56ff1df63ae61431b20aab722e9f8a5f2b44 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=216c56ff1df63ae61431b20aab722e9f8a5f2b44 commit 216c56ff1df63ae61431b20aab722e9f8a5f2b44 Author: Warner Losh AuthorDate: 2024-02-29 17:58:52 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:28 +0000 loader/lua: Remove compat shim for loader.lua_path loader.lua_path was committed before stable/13 was branched, and merged in to for 12.2. Remove workaround for it not being present. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44143 (cherry picked from commit ab97d42addae97a389c6f22d6bba62ed954bb8e7) --- stand/lua/core.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 9226de564348..eaabff6a7602 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -65,13 +65,7 @@ end -- message on failure. function try_include(module) if module:sub(1, 1) ~= "/" then - local lua_path = loader.lua_path - -- XXX Temporary compat shim; this should be removed once the - -- loader.lua_path export has sufficiently spread. - if lua_path == nil then - lua_path = "/boot/lua" - end - module = lua_path .. "/" .. module + module = loader.lua_path .. "/" .. module -- We only attempt to append an extension if an absolute path -- wasn't specified. This assumes that the caller either wants -- to treat this like it would require() and specify just the