changeset 19327:aeb600963fe9

pygnulib.py: simplify license conflicts detection
author Dmitry Selyutin <ghostmansd@gmail.com>
date Thu, 28 Sep 2017 21:08:01 +0300
parents 8014a35f4714
children f88dfd71e0fd
files pygnulib.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pygnulib.py	Thu Sep 28 18:53:30 2017 +0300
+++ b/pygnulib.py	Thu Sep 28 21:08:01 2017 +0300
@@ -93,8 +93,9 @@
     # Determine license incompatibilities, if any.
     incompatibilities = set()
     if config.licenses & {"LGPLv2", "LGPLv2+", "LGPLv3", "LGPLv3+"}:
+        acceptable = IGNORED_LICENSES | config.licenses
         for (name, licenses) in ((module.name, module.licenses) for module in main):
-            if not ((IGNORED_LICENSES & licenses) or (config.licenses & licenses)):
+            if not (acceptable & licenses):
                 incompatibilities.add((name, licenses))
     if incompatibilities:
         print("{0}: *** incompatible license on modules:".format(script), file=sys.stderr)