From nobody Thu Feb 29 17:59:33 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 4TlzWV23tmz5CcvG;
Thu, 29 Feb 2024 17:59:34 +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 4TlzWV175Lz4GTM;
Thu, 29 Feb 2024 17:59:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1709229574;
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=ReEF+cU6fUAVvNXlFYSaDuw33OAeHOFSXrAeJYeB4pk=;
b=eTMhTmOunRhwmi6wu84IHfd0qrHeBaV2eXm1QuwkFAvXkVRIl3kfSPT+9Wp95E2Nz+iSp2
YF6CQnHMzVT8ctb+YG2C9EUvZMzjzUWxLGpblXQsZQQbppFbMi7lizcqWmsvGU0b0KHHz9
pHGG+DvA5AlifpDDeU750XdzXz+jg/o0J6PztBcq2KBzzrEHpQ1N9hEFLc2MYVXOssuYV4
9rF0ygdIHbweE+eZJq+7ZRNfE9DhCcc1CxIZlfP0H7nwvP7/MQpHyJhekPyIVfxnEYpL8H
RCwrCmOUTvCnrKzjKojjKkpY5k34p/RvbONvInHfGHW4buOi+e1YBs0Jrb74Ig==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709229574; a=rsa-sha256; cv=none;
b=r7x96Oi1MJCMookAgOBJp6vnxkMA4vVaN5mWlgFdAYy3/mcyiriVjuEvclWy0wkbraqtQn
j6rbFQbVlBQGIafqarydQUzlvvsMyyO2QBcLYOi42XEZ5V8W9VtDY2yBSRQvaUuIumDKl4
gfbMhFTEoyW/XTUUBTN1hqgemsRDR0dp7HDHbvc1KlzSRrG6fea+P4DTYNw/TvJRmJeB3q
tJRXWG4CvuX/eUl+QzRTzMyA404rWhxjdc5oIv4/ENRmIQQB8WykDwRmOhAMximVBHMGjS
jKRE6xVgvOWOAhhGEdnuIjAL6CBdJ4MF/sWdxn3booXKQy482P43XRuacm+k6A==
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=1709229574;
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=ReEF+cU6fUAVvNXlFYSaDuw33OAeHOFSXrAeJYeB4pk=;
b=CKk+mK8KrpthB+ds/+5Dz2H5qxC3UFlGRgHBBEbSDy0V2EUAaDh8kwshkUSmXS9SGIR/W1
OwsIEomCIXhyvTyJR8vD9cnHUc0bHlgHdNkYEYfy2lAJFSAHsg8p5Azb6ck9rj02HdBD3O
cGZ1DNLzz+d6dWuu189EPmpbNHSg5hAmoLUvi7nlhWpU6+5gDYCtSe5M6EDXT16mX8fPkc
1uTPMkb2E0Of/JYT1jvNF8xkaFwXXYAN9HpIPSUSx0ReQEDkn1+pwvevVd8Xc2pk/lB9PI
5rs6opt/GVjuEPx2RI0mLOaHb3Sy7st1Y3zSlqkfogL9QhwkesSXYHMp4AX4UQ==
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 4TlzWV0lY3zrxs;
Thu, 29 Feb 2024 17:59:34 +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 41THxY1U077690;
Thu, 29 Feb 2024 17:59:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41THxXSl077687;
Thu, 29 Feb 2024 17:59:33 GMT
(envelope-from git)
Date: Thu, 29 Feb 2024 17:59:33 GMT
Message-Id: <202402291759.41THxXSl077687@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 552f3072af54 - main - loader/lua: Remove workaround
for command_error
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: 552f3072af54820cf1805f712e2567bc1b7f046d
Auto-Submitted: auto-generated
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=552f3072af54820cf1805f712e2567bc1b7f046d
commit 552f3072af54820cf1805f712e2567bc1b7f046d
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-29 17:58:59 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-29 17:58:59 +0000
loader/lua: Remove workaround for command_error
loader.command_error was available prior to stable/12 branching. No need
to check if it is available or not.
Sponsored by: Netflix
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D44144
---
stand/lua/config.lua | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 86f5ef6174a2..ba6144364247 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -407,12 +407,7 @@ local function loadModule(mod, silent)
end
if cli_execute_unparsed(str) ~= 0 then
- -- XXX Temporary shim: don't break the boot if
- -- loader hadn't been recompiled with this
- -- function exposed.
- if loader.command_error then
- print(loader.command_error())
- end
+ print(loader.command_error())
if not silent then
print("failed!")
end