[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-48-ga058fec

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=a058fec805e1c0272509be3e3eea5b372f2d36fd

commit a058fec805e1c0272509be3e3eea5b372f2d36fd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Jul 5 18:28:51 2019 +0100

    Suppress empty-but-not-obsolete warning for existing cases
    
    Going forward, these should either have their dependencies removed and
    be made obsolete, or be marked as meta-packages (via a category?)


Diff:
---
 calm/package.py       |    2 +-
 calm/past_mistakes.py |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index ea2291e..3867f33 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -764,7 +764,7 @@ def validate_packages(args, packages):
                     if ('source' not in packages[p].vermap[vr]) and ('external-source' not in packages[p].version_hints[vr]):
                         if 'install' in packages[p].vermap[vr]:
                             if packages[p].tar(vr, 'install').is_empty:
-                                if ((p in past_mistakes.empty_but_not_obsolete) or
+                                if ((vr in past_mistakes.empty_but_not_obsolete.get(p, [])) or
                                     ('empty-obsolete' in packages[p].version_hints[vr].get('disable-check', ''))):
                                     lvl = logging.DEBUG
                                 else:
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 0eceb76..4ad1ee0 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -144,10 +144,20 @@ nonunique_versions = [
 # packages with an empty install file, no source, but aren't obsolete
 #
 # don't add to this list, use 'disable-check: empty-obsolete' in pvr.hint instead
-empty_but_not_obsolete = [
-    'libpopt0',        # version 1.16-1 was empty
-    'libpopt-devel',   # version 1.16-1 was empty (x86_64)
-]
+empty_but_not_obsolete = {
+    'gambas3': ['3.12.0-1', '3.12.2-1', '3.13.0-1'],       # a metapackage
+    'gmp': ['6.1.0-3p1', '6.1.1-1', '6.1.2-1'],            # useless empty package, not autosupressed as it has depends
+    'isl': ['0.14.1-1', '0.16.1-1'],                       # useless empty package, not autosupressed as it has depends
+    'kdegames3': ['3.5.10-11'],                            # a metapackage
+    'kdewebdev': ['15.04.3-1', '16.08.3-1', '16.08.3-2'],  # a metapackage
+    'libao': ['1.1.0-1'],                                  # useless empty package, not autosupressed as it has depends (used to contain doc)
+    'libpopt-devel': ['1.16-1'],                           # version 1.16-1 was empty (x86_64)
+    'libpopt0': ['1.16-1'],                                # version 1.16-1 was empty
+    'mbedtls': ['2.12.0-1', '2.14.1-1', '2.16.0-1'],       # useless empty package, not autosupressed as it has depends
+    'mpclib': ['1.0.2-2', '1.0.3-1', '1.1.0-1'],           # useless empty package, not autosupressed as it has depends
+    'mpfr': ['4.0.1-3p6', '4.0.1-4p11', '4.0.2-1'],        # useless empty package, not autosupressed as it has depends
+    'ocaml': ['4.02.3-2'],                                 # a metapackage
+}
 
 # packages with timestamp anomalies
 #