[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200401-39-g97e0d1a

[Jon TURNEY]

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

commit 97e0d1ac15e49c62d1c2479fb45fbe3166eda600
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jun 7 15:19:34 2020 +0100

    Teach check that requires: are satified to know about provides:

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

commit e80c5fa508d7e6028d4c44023247b59d77705b5c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Mar 1 20:18:17 2020 +0000

    Add zstd compression of setup.ini


Diff:
---
 calm/calm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index c2ba507..66307bc 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -448,7 +448,7 @@ def do_output(args, state):
                     irk.irk("calm updated setup.ini for arch '%s'" % (arch))
 
                     # compress and re-sign
-                    for ext in ['.ini', '.bz2', '.xz', '.zstd']:
+                    for ext in ['.ini', '.bz2', '.xz', '.zst']:
                         extfile = os.path.join(basedir, 'setup' + ext)
                         try:
                             os.remove(extfile + '.sig')
@@ -459,7 +459,7 @@ def do_output(args, state):
                             utils.system('/usr/bin/bzip2 <%s >%s' % (inifile, extfile))
                         elif ext == '.xz':
                             utils.system('/usr/bin/xz -6e <%s >%s' % (inifile, extfile))
-                        elif ext == '.zstd':
+                        elif ext == '.zst':
                             utils.system('/usr/bin/zstd -q --ultra -20 %s -o %s' % (inifile, extfile))
 
                         keys = ' '.join(['-u' + k for k in args.keys])