From: Collin Funk <collin.funk1@gmail.com>
To: bug-gnulib@gnu.org
Subject: gnulib-tool.py: Don't remove duplicate avoided modules.
Date: Sun, 7 Apr 2024 16:48:28 -0700 [thread overview]
Message-ID: <e40e590f-16c4-475e-bdd2-74a9a85cd765@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
In test-gettext-7.sh there are missing modules in gl_AVOID and the
actioncmd printed on Makefiles. This is because gnulib-tool.py will
remove the duplicates. This patch fixes that.
Collin
[-- Attachment #2: 0001-gnulib-tool.py-Don-t-remove-duplicate-avoided-module.patch --]
[-- Type: text/x-patch, Size: 1555 bytes --]
From 4fa6f5231eed42a9935c1f25cdf3c1db3431a8c4 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Sun, 7 Apr 2024 16:41:18 -0700
Subject: [PATCH] gnulib-tool.py: Don't remove duplicate avoided modules.
* pygnulib/GLConfig.py (GLConfig.addAvoid): Don't remove duplicates from
the modules passed with --avoid.
---
ChangeLog | 6 ++++++
pygnulib/GLConfig.py | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e9054029a7..535dfc04cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-07 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Don't remove duplicate avoided modules.
+ * pygnulib/GLConfig.py (GLConfig.addAvoid): Don't remove duplicates from
+ the modules passed with --avoid.
+
2024-04-07 Bruno Haible <bruno@clisp.org>
sigsegv tests: Avoid a crash on NetBSD 10.0/i386.
diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py
index f5282dbf53..0f9d118a78 100644
--- a/pygnulib/GLConfig.py
+++ b/pygnulib/GLConfig.py
@@ -559,8 +559,7 @@ class GLConfig:
'''Avoid including the given module. Useful if you have code that provides
equivalent functionality.'''
if type(module) is str:
- if module not in self.table['avoids']:
- self.table['avoids'].append(module)
+ self.table['avoids'].append(module)
else: # if module has not str type
raise TypeError('avoid must be a string, not %s'
% type(module).__name__)
--
2.44.0
next reply other threads:[~2024-04-07 23:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-07 23:48 Collin Funk [this message]
2024-04-08 0:20 ` gnulib-tool.py: Don't remove duplicate avoided modules Bruno Haible
2024-04-08 0:38 ` gnulib-tool.py current status Collin Funk
2024-04-10 10:49 ` Bruno Haible
2024-04-11 13:20 ` Bruno Haible
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e40e590f-16c4-475e-bdd2-74a9a85cd765@gmail.com \
--to=collin.funk1@gmail.com \
--cc=bug-gnulib@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).