[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-21-g33186c1

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-21-g33186c1

[Jon Turney]

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

commit 33186c17fdbd77548a4a132efbaca686039b5dd3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Apr 23 14:01:56 2023 +0100

    Add some historic ruby provides, prior to expiring them

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

commit bb7f367c1915c6e67f4d3d5574c1120dc1f5658b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Apr 9 19:51:27 2023 +0100

    mksetupini: Warn about migrating obsolete --okmissing options
    
    Also drop obsolete, genini-compatible --okmissing option from help text.


Diff:
---
 calm/mksetupini.py    | 6 ++++--
 calm/past_mistakes.py | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/calm/mksetupini.py b/calm/mksetupini.py
index 09ec5b1..66449e1 100755
--- a/calm/mksetupini.py
+++ b/calm/mksetupini.py
@@ -139,7 +139,7 @@ def main():
     parser.add_argument('--disable-check', action=flatten_append, help='checks to disable', type=disable_check_choices, default=[], metavar=disable_check_choices.help())
     parser.add_argument('--inifile', '-u', action='store', help='output filename', required=True)
     parser.add_argument('--ignore-errors', action='store_true', help='ignore errors')
-    parser.add_argument('--okmissing', action='append', help='superseded by --disable-check', choices=['curr', 'depended-package', 'obsoleted-package', 'required-package'])
+    parser.add_argument('--okmissing', action='append', help=argparse.SUPPRESS, choices=['curr', 'depended-package', 'obsoleted-package', 'required-package'])
     parser.add_argument('--pkglist', action='store', nargs='?', metavar='FILE', help="package maintainer list (default: " + pkglist_default + ")", const=pkglist_default)
     parser.add_argument('--release', action='store', help='value for setup-release key', default='')
     parser.add_argument('--releasearea', action='store', metavar='DIR', help="release directory (default: " + relarea_default + ")", default=relarea_default, dest='rel_area')
@@ -160,7 +160,9 @@ def main():
     # For the moment '--okmissing=foo' is silently transformed into it's
     # equivalent '--disable-check=missing-foo'
     if args.okmissing:
-        args.disable_check.extend(['missing-' + m for m in args.okmissing])
+        for m in args.okmissing:
+            print("Warning: --okmissing={0} is obsolete, use --disable-check=missing-{0} instead".format(m), file=sys.stderr)
+            args.disable_check.append('missing-' + m)
 
     # disabling either of these checks, implies both of these are disabled
     # (since depends: is generated from requires:, and vice versa, if not
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index e102337..17c23fd 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -162,6 +162,8 @@ nonexistent_provides = [
     'python3-dbus-debuginfo',
     'tl_2023',
     'tl_basic_2023',
+    'ruby_22',
+    'ruby_20',
 ]
 
 # provides: which don't exist and packages which require them should be expired