aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Wyatt <[email protected]>2018-10-14 10:08:28 -0400
committerDaniel Wyatt <[email protected]>2018-10-14 10:34:33 -0400
commit8cddb392fccbd74fb18258a06ee5c6de4f9da259 (patch)
tree13cd999266bb3f4fec7cb7be1b659809fe7c9121
parent9249da3c4e87bfbdbe88882e65ae01d1f90e31eb (diff)
Allow configure.py parse_multiple_enable to accept an empty list and extra commas.
Examples: ./configure.py --enable-modules= ./configure.py --enable-modules=zlib,openssl, ./configure.py --enable-modules=zlib,,bzip2,
-rwxr-xr-xconfigure.py3
-rw-r--r--doc/credits.rst5
-rw-r--r--news.rst3
3 files changed, 10 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index 31c6beeab..c5a3fda32 100755
--- a/configure.py
+++ b/configure.py
@@ -619,7 +619,8 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state
def parse_multiple_enable(modules):
if modules is None:
return []
- return sorted(set(flatten([s.split(',') for s in modules])))
+
+ return sorted({m for m in flatten([s.split(',') for s in modules]) if m != ''})
options.enabled_modules = parse_multiple_enable(options.enabled_modules)
options.disabled_modules = parse_multiple_enable(options.disabled_modules)
diff --git a/doc/credits.rst b/doc/credits.rst
index 7365370c3..fcad67d73 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -147,3 +147,8 @@ snail-mail address (S), and Bitcoin address (B).
N: Erwan Chaussy
D: Base32, Base64 matching Base32 implementation
S: France
+
+ N: Daniel Wyatt (on behalf of Ribose Inc)
+ W: https://www.ribose.com/
+ D: SM3, Streebog, various minor contributions
diff --git a/news.rst b/news.rst
index 9e51ba83c..15a6d9366 100644
--- a/news.rst
+++ b/news.rst
@@ -14,6 +14,9 @@ Version 2.9.0, Not Yet Released
* Fix small issues when building for QNX
+* Make configure.py parse_multiple_enable accept an empty list and
+ trailing/extra commas.
+
Version 2.8.0, 2018-10-01
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^