From nobody Thu Sep 26 11:06:19 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 4XDrPl5ZrPz5X8Ft; Thu, 26 Sep 2024 11:06:19 +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 4XDrPl4lgyz4HNJ; Thu, 26 Sep 2024 11:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348779; 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=Ne5ljSJFe6L1U5npSksW0EmgrzU2plGTaV0D8G9wgo0=; b=tcbd+akf/PxRHMq7KfVtiBWe40jJb32caL4ugj6QU8CdhHFguxGyKZmPIuW5QHJyUoHVq3 z4RHt4BeWoX3YVTwRYPJ5T9ssZT7t9TE+Bi0Inb9QRdAI9gujgZzn6z+8nr4D9JhhZtO5i mXYqVYNJxbdXNJciYjHlsBvK8PZblcM81lWw8sgHS8lop64QYmGBFS0+W+J696lrepV9Vn UU9wSI/uVrfTz+1IRfK/RT9Bi8fnpBaYG7iDVbD18bMfbBlUKXHenOBActhBVA4IReBe8i gmBd4Bh5VfesYQV7kZ2DvLP/Kj+hNhzN6AWt3p3KVvSbr+KlowGAbOo3Nl4y6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348779; 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=Ne5ljSJFe6L1U5npSksW0EmgrzU2plGTaV0D8G9wgo0=; b=U1tSKfVlM/1SFHp5H2gTtwI3uYsOquFDfNR7PGgcRpKmoAG8H4fqIXqqJA4alRpCWHik6k qk26tiBlGR0ovU4gZfrH7TYBjDo8L99P+q6030IDCtcW4ZNjcf0ctILaDq6nn3C5KU5X3N 6agzvXG3Y7zoGzwhqWiQZH269btvDM8wy4duHRqEKbCw8ZqcoQDUeyd4OJ6zLIqabYK0q7 KLtYln1KFmgGmteGQS+pjuvIggFZ2UJmkLW826mjtZBXqAeMyzjmSmsOL63eL3YgV7SkUn u9wYM3KVUSmSMnAo1mXkiBC/CSYRBOnSiLiDjQCMgJgSSqMdR7I4jkxSivEaKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727348779; a=rsa-sha256; cv=none; b=SgZRRk09TrWMcebhJlh0wE+1p8iRLUQnd8gKq3Z3AqU4wljW6GrajJzewyifmH6hXO1pVb DhlWw/kO+jP3ucgyi/4iqFvRThgr9+4Il6s4jrOaIoQs/uSetqz7u5pXtZLVVloSGrDexp HwzhJFYASNZdCKeDRtk/9lnziyGmawlPkK0Xi83Pt4D+89+XKG5DMjewilktApSXgv5m7e ybuX9AcqgXsdbvDDJUB54+9t6GLobNDF2Ah8B2+O7zr4VlKhQv2A4r41pQOqrOJTb2VikS rl0e1nLleI9E/l8CdJGFymXBSpCdBdR5AgnpRdflfg3TD09cdjmx5NIYU1iL2A== 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 4XDrPl3Vk7zv7M; Thu, 26 Sep 2024 11:06:19 +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 48QB6JYm063556; Thu, 26 Sep 2024 11:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48QB6Jqv063553; Thu, 26 Sep 2024 11:06:19 GMT (envelope-from git) Date: Thu, 26 Sep 2024 11:06:19 GMT Message-Id: <202409261106.48QB6Jqv063553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 38bb6f79e39a - main - nuageinit: Standardize user-facing error messages 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38bb6f79e39a14ea99f559f59129a4cadf92b569 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=38bb6f79e39a14ea99f559f59129a4cadf92b569 commit 38bb6f79e39a14ea99f559f59129a4cadf92b569 Author: Jose Luis Duran AuthorDate: 2024-07-30 01:59:16 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-26 10:59:24 +0000 nuageinit: Standardize user-facing error messages Signed-off-by: Jose Luis Duran --- 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 }