From nobody Thu Feb 29 17:59:32 2024 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 4TlzWT0sdfz5Cck4; Thu, 29 Feb 2024 17:59:33 +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 4TlzWT0KNjz4GhD; Thu, 29 Feb 2024 17:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709229573; 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=TC4wZivxaW1n2HarHvlwj/H0RbEalNIc5kjUgDxFMRU=; b=pARMk8akzw4uHTXnnW5ZjCUeeMqVvVll3IUJ/hXx57ZIlq3wNiQUTFlinlEnnmrQkjbl5i ttFfJPKsZS/Nu0wJsoJiY0M1iYdB8eo8WlgkE5pG7SDogDcZRgyA4V/kIoEdDLswDjIAFq 5f9SH+59UfAL0u0Ihz+UpyLsHTrQZBFRh8kZAfVScud/37SFDIe2N7HF7QNTpAInYJxBiC 1viNjZfQ6L9evD/TMj1EXNFwMCBXVXnLh8gQjowf13qZSIWyEOiJApZTcE1fXTwGEeOo1y +9QHN83EvPCfnQa1nOHgiLerXntKlHwoIQsEBJG3E2YAuvEAgfy5RRmlEijdkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709229573; a=rsa-sha256; cv=none; b=JCzo2WkkOvHkJUu/WMlQaJL6JDeJJeW7TxgVn4DydahvRt+IqO79hMu+k6rFAksex6NIwl SD10O3ztCr7TMFIQvkmv8TSYe2J6/no/duZ0wJM9seis11i7B1MFz/wpWeV0+OHFHREbLY BvpBJ1tb8Sk3MybT7dbU+D/Fl7qiKW0L2PLyHNuZ5JDr873J5e12m8czRGj87yXwqAPWqR rpR8WP6sI2tZDr8b1RuLXG8DKYRYq2Fv5RB2IH6XuBtafG/2eOMu4inODV2hgTkrTXm/Gg Hqqixigm9QNWWB6okEIHc0f/cJbwpZ2COdfWmkajTEi43LIQrXNoOH6b7C88LQ== 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=1709229573; 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=TC4wZivxaW1n2HarHvlwj/H0RbEalNIc5kjUgDxFMRU=; b=rJeRSsbn6I9Xmk8xt3u3LsqNCXJYZujLKOPcAbl6hIQpLSLMJck25E6rt3XDm+T+58QWY1 Z3CyoL0/02EDeOmDVOab6QbCCN2ns9zlK40JAbc/fk8LFbNGddMbxJHNawSIbBK7sPQUMz PxAPmrZ4mD+D4wneuc2TxX67RiDBHLQSkwi2XNQWTYhwfZOwDiO5Hlxi2VFm3hfibdS9q+ h49JcHNkyO7gowjLhXonOZFE+ffRkupap+IX8FrzCGP63EUepaH+8omp1NquG6/vY0WsN+ MsM7io+Zh8vgJATJQ0gr7OAtgDpEViAd4ObLpz3moDnR3Ac6lVL5EaWbFd0kRA== 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 4TlzWS71m6zs0C; Thu, 29 Feb 2024 17:59:32 +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 41THxWqv077648; Thu, 29 Feb 2024 17:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41THxW00077645; Thu, 29 Feb 2024 17:59:32 GMT (envelope-from git) Date: Thu, 29 Feb 2024 17:59:32 GMT Message-Id: <202402291759.41THxW00077645@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ab97d42addae - main - loader/lua: Remove compat shim for loader.lua_path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ab97d42addae97a389c6f22d6bba62ed954bb8e7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ab97d42addae97a389c6f22d6bba62ed954bb8e7 commit ab97d42addae97a389c6f22d6bba62ed954bb8e7 Author: Warner Losh AuthorDate: 2024-02-29 17:58:52 +0000 Commit: Warner Losh CommitDate: 2024-02-29 17:58:52 +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 --- 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