I figured it was from a script but I am not very familiar with the
code. This patch fixes the fetch script and replaces the warning
message. There is probably a better way to do it so feel free to
change it.
On 2/1/24 10:29 AM, Zack Weinberg wrote:
> On Thu, Feb 1, 2024, at 7:00 AM, Collin Funk wrote:
>> Hello, I ran into a test failure for "m4_warn (bad categories)". I
>> believe that this is just a typo introduced by commit b553b19. I
>> attached a patch that fixes the test failure.
>
> Your patch is correct, but incomplete. The typo was introduced by an
> automatic process, namely the script run by "make fetch" (build-aux/fetch.pl,
> if I remember correctly). It must also be corrected, or else the typo will
> come back the next time someone runs "make fetch".
>
> Can you try to fix that script? I can't do it myself right now because my
> work computer is broken.
>
> zw
>
From 410c2725105cb300be6570253e687580eaf5f87e Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Thu, 1 Feb 2024 11:25:59 -0800
Subject: [PATCH] Fix typo which causes test "m4_warn (bad categories)" to
fail.
* lib/Autom4te/ChannelDefs.pm (report_bad_channel): Fix warning
message so that it refers to autom4te instead of automake.
* build-aux/fetch.pl (fetch): Replace automake with autom4te in
warning messages.
Copyright-paperwork-exempt: Yes
---
build-aux/fetch.pl | 1 +
lib/Autom4te/Channels.pm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/build-aux/fetch.pl b/build-aux/fetch.pl
index 1c675ffd..5fbe1346 100755
--- a/build-aux/fetch.pl
+++ b/build-aux/fetch.pl
@@ -240,6 +240,7 @@ sub fetch ($$$$$$)
# don't use \s here or it will eat blank lines
$content =~ s/[ \t]+$//gm;
$content =~ s/\bAutomake::/Autom4te::/g if $edit;
+ $content =~ s/\bautomake\s+--help/autom4te --help/g if $edit;
replace_if_change ($destpath, $content, $quiet);
}
diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index 73bca6e3..3104a294 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
@@ -689,7 +689,7 @@ sub report_bad_channel ($$)
# don't treat those cases as errors.
$report_as = 'obsolete';
$message = "use of $q_channel as a diagnostic category is obsolete\n";
- $message .= "(see automake --help for a list of valid categories)";
+ $message .= "(see autom4te --help for a list of valid categories)";
}
elsif ($channel eq 'none'
|| ($channel =~ /^no-/ && exists $channels{substr($channel, 3)}))
--
2.43.0.440.gb50a608ba2
