From nobody Tue Oct 08 07:07:48 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 4XN6Y04MsYz5Z4wD; Tue, 08 Oct 2024 07:07:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN6Y03GjDz42ms; Tue, 8 Oct 2024 07:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371268; 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=rJC+m92DiMMVnu9c2Rbj6QQNQBHwsFMv0H3G8+3XGDM=; b=KUazA4LZAgVOOD/kI6GAUcwInrTrH0h4rRhluLP2ZF6hdvvwAnKbmot14AdxjRzfege6s7 vS16+JAKVno5iEPnILmE0J2kApfQQkWNnbFVrhtXrqBnpECDCIp3bo6itaDvPhqOjKiDxC jktdGPEZ+4MkDsE35/noCNt4SBOeP7A2svznNjY1lC50YJk5lWBo2jE8tsheB5QLpTukaU 87eLrghOchs2eOAToKMdSOcUSiZ+/jcAtJPykMVhtfpTxSP+c2pO4k9+9oKonkDfI+BPOO DMJj8V2ceBLhBPFz0D3YeI9uWIYtiCrp3zyRjHV8eEduHh3QWWCeIuVigIOtmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371268; 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=rJC+m92DiMMVnu9c2Rbj6QQNQBHwsFMv0H3G8+3XGDM=; b=Z1kAsVMxJLPwEZNZf9xRu3++vAXEfPsS+7YebKBoFVGHIvXPvb1+bRZsJYlOZztiz0f3oz Tr66P8Zg1dkWUmujy8iE4dkGwCZnAH2mPBWpZexoMmjwxnxAXv55ooxxUExbD++l1+ZmmB XQUKcbBAAtLPeAw1Ba3D3XWEs2rpZVjzR2XBGru6HZXFUQYHo3kgcxPu99uWbGjbTd4He3 PwzXBMfLYvXKPcPen+kO8I3b9oa4opGqdJzo88r5C3S36sH3EbIl+9pEtDhH5SLOyWc5Qp vIudk5cUAznk5kKBFWbx5ZRtpRzbE6Mz07uP1Dgio3oSRfd31SV1kw56s3xHdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728371268; a=rsa-sha256; cv=none; b=mFIZQVESbzMUv+NAAbQopRcWDz9OD4ZxnJp6i2+fo0PmZ1tHpRJtPD2cac9lnoxxYAhise zTchaCGXpG9QpYhFZeUWpl42YgGHaFIhYb5MqSocUpqaNQe0jZZFcfoQwCekiqyvdzBWVr q8f/RjbUwvVhrhzBVVx9dm46vMX/QSxz863bAoTpm3F7TJm9bRJDbVa5ApQewfdZMIrxTS SynVi8EUHfcYY/L5XdGsFuuQRXWHMPBjAEEDnxbcUOOItMKr3ynecRVePs5yubMQT0bBsm ErRESi0Mm9jE/obnONQlLeeTLN3D2RPqFbCdo2BnCB+4n/FbJiVqvNxubhkMhQ== 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 4XN6Y02mTtzLGM; Tue, 8 Oct 2024 07:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49877moK051573; Tue, 8 Oct 2024 07:07:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49877mKC051570; Tue, 8 Oct 2024 07:07:48 GMT (envelope-from git) Date: Tue, 8 Oct 2024 07:07:48 GMT Message-Id: <202410080707.49877mKC051570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 03abe3ac4077 - stable/14 - nuageinit: Standardize user-facing error messages 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03abe3ac4077101f30561fe8ca0b4007012bd63b Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=03abe3ac4077101f30561fe8ca0b4007012bd63b commit 03abe3ac4077101f30561fe8ca0b4007012bd63b Author: Jose Luis Duran AuthorDate: 2024-07-30 01:59:16 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-08 07:04:01 +0000 nuageinit: Standardize user-facing error messages Signed-off-by: Jose Luis Duran (cherry picked from commit 38bb6f79e39a14ea99f559f59129a4cadf92b569) --- libexec/nuageinit/nuageinit | 2 +- libexec/nuageinit/tests/nuageinit.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8c289fea6b1d..c8f74d13b7fd 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -9,7 +9,7 @@ local ucl = require("ucl") local yaml = require("yaml") if #arg ~= 2 then - nuage.err("Usage " .. arg[0] .. " [config-2|nocloud]", false) + nuage.err("Usage: " .. arg[0] .. " ( | )", false) end local path = arg[1] local citype = arg[2] diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index f3fc55e87523..6b8ea7ff3328 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -19,9 +19,9 @@ atf_test_case config2_network_static_v4 args_body() { - atf_check -s exit:1 -e inline:"Usage /usr/libexec/nuageinit [config-2|nocloud]\n" /usr/libexec/nuageinit - atf_check -s exit:1 -e inline:"Usage /usr/libexec/nuageinit [config-2|nocloud]\n" /usr/libexec/nuageinit bla - atf_check -s exit:1 -e inline:"Usage /usr/libexec/nuageinit [config-2|nocloud]\n" /usr/libexec/nuageinit bla meh plop + atf_check -s exit:1 -e inline:"Usage: /usr/libexec/nuageinit ( | )\n" /usr/libexec/nuageinit + atf_check -s exit:1 -e inline:"Usage: /usr/libexec/nuageinit ( | )\n" /usr/libexec/nuageinit bla + atf_check -s exit:1 -e inline:"Usage: /usr/libexec/nuageinit ( | )\n" /usr/libexec/nuageinit bla meh plop atf_check -s exit:1 -e inline:"nuageinit: Unknown cloud init type: meh\n" /usr/libexec/nuageinit bla meh }