From nobody Wed Dec 10 18:11:23 2025 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 4dRP174nhTz6KwSw for ; Wed, 10 Dec 2025 18:11:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRP173Yg3z3pW5 for ; Wed, 10 Dec 2025 18:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765390283; 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=T7OoX+beYHc57sm4jCzT2cY8hPLKmsijv9JhmGGW0zs=; b=uNzAH9/dDMsroPcZpuNjrIOOlsg5SGkOBk6aTkZNWMQnU6jR6130Qu5UyHRVzzB3qdVpTl 07shOHuxLXR3x7oVZ0onSpXMFpWZBlbZL86Pzs4HzyzSVU7ptTJTUQ8/ggLK56KiRmgt3m ZC7Ju0kNjwLE0Ts1tyZVrhEC6BAQTlBceK5Lzibh4rvkXuV7dx34ftPDnu1EhD9blS7KgM Hl4+6q5zY9sGua8tAVxcSsL+UOAUWnbF8xQQbOKOfxX+stslxTXKudWSHZVNpi4LyvFzxn 8XZadOjuqvYAoF50rfeJIqagXgPdgZ0N5QgENuZUqn8c2bMTKFxyj3JjGmGJDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765390283; 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=T7OoX+beYHc57sm4jCzT2cY8hPLKmsijv9JhmGGW0zs=; b=F0to6w2Tr5bj1EF8C/M5EY2BzxEQBiyLNqfb7Rv9RPRpCpcuudOTgoAnEdzN+tCE9At4ir UieEqeMm9VsLhn5Hk+9HXieC8SSaKM2DLGYfsZvpR1ZdTdtukj63iYxvh0EGtQBXsFj9vk spOq3vOag5U+9uC+/HYO32Am75CAuhZ0GRv4IKDqdS0VUgGG7tFUHAuEKpzUFUP+WDubw2 jRFVfKukREBpdnUCPZFLKDhzj2pU5CLOa28iTCeFDEPHPITsvjnQg4Pw7qiHuAyj6PtsfE zzbFhWWG8lLJZVzPD1rlpMovCsRpt1dOC8e1lHHNZMeX+LN9aS2MK3UrJ3IejA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765390283; a=rsa-sha256; cv=none; b=oNmRZrYYDBVJioeJbffmYeJlqn1WFoDTw16woMMeF9nfcVPBCrIj+TGH+yfRyyMLbR4qn8 q3TcDwwB/BiMqYoLu+vX3kX6MrVZxoVe8MvMwXFseLw4i75KFUONBeg7YUKXrT/1CNieWI n29NBLQToG4G2bZY0BQyNHtZaqKdSYUg2afxlRVytho+bmQoJEV7SkZoASrzILFF+dfP6z h/558IsFKM5qp8NZkM2U2n4sm0A9q8EssWlu4fvGD6m5018PfJenMASAyLtaOCzKSde0Kl k+HuU/YuaEhMPAXLxsjY7xZLDuHjnuR2S9FYyw+SJVYjsMLqPworydRExFD87w== 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 4dRP1736mtzwnT for ; Wed, 10 Dec 2025 18:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d05d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 18:11:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: a0347b0f3a60 - main - gpart: "gpart --libxo:JP list" duplicates attribute keys 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0347b0f3a6088872c29eddb85154478d543dffb Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 18:11:23 +0000 Message-Id: <6939b7cb.d05d.6c0036bc@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=a0347b0f3a6088872c29eddb85154478d543dffb commit a0347b0f3a6088872c29eddb85154478d543dffb Author: Alan Somers AuthorDate: 2025-12-05 16:16:53 +0000 Commit: Alan Somers CommitDate: 2025-12-10 18:08:30 +0000 gpart: "gpart --libxo:JP list" duplicates attribute keys Add leaf-list modifier to attrib as it's possible to have multiple attributes on a gpart provider. I purposely made it so that the normal output still says "attrib:" just so we don't break any scripts people may be using to parse the output, but the libxo output now says "attribute" just like `gpart show` will do once https://reviews.freebsd.org/D53950 is merged. PR: 291377 MFC after: 1 week Reviewed by: asomers Sponsored by: ConnectWise Differential Revision: https://reviews.freebsd.org/D54080 --- sbin/geom/core/geom.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 51ea52a3e858..a1b1b351ebb3 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -912,8 +912,12 @@ list_one_provider(struct gprovider *pp, const char *padding) } xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, - conf->lg_name, conf->lg_val ? conf->lg_val : ""); + if (strcmp(conf->lg_name, "attrib") != 0) + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); + else + xo_emit("{P:/%s}{Lcw:attrib}{l:attribute}\n", padding, + conf->lg_val ? conf->lg_val : ""); } }