From 2b2f772790be99cbe79d1d1bfd626a29ea935b29 Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Sun, 14 Aug 2022 15:57:57 -0700 Subject: [PATCH] =?UTF-8?q?clarify=20"=E2=80=A6variable=20is=20shadowed=20?= =?UTF-8?q?by=20the=20global=20variable=20of=20the=20same=20name"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rephrase this to more explicitly indicate that the uvar actually was successfully set. I believe the prior phrasing can leave some ambiguity as far as wether set just failed with an error, whether it has done anything or not. --- src/builtins/set.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builtins/set.cpp b/src/builtins/set.cpp index 0a607312f..0f482fcea 100644 --- a/src/builtins/set.cpp +++ b/src/builtins/set.cpp @@ -83,7 +83,7 @@ static const struct woption long_options[] = {{L"export", no_argument, nullptr, #define BUILTIN_SET_MISMATCHED_ARGS _(L"%ls: given %d indexes but %d values\n") #define BUILTIN_SET_ARRAY_BOUNDS_ERR _(L"%ls: array index out of bounds\n") #define BUILTIN_SET_UVAR_ERR \ - _(L"%ls: Universal variable '%ls' is shadowed by the global variable of the same name.\n") + _(L"%ls: successfully set universal '%ls'; but a global by that name shadows it\n") static int parse_cmd_opts(set_cmd_opts_t &opts, int *optind, //!OCLINT(high ncss method) int argc, const wchar_t **argv, parser_t &parser, io_streams_t &streams) {