[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20221205-32-g345dde9

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20221205-32-g345dde9

[Jon Turney]

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

commit 345dde9609b5d72595e007056952efb018273982
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Feb 5 16:41:55 2023 +0000

    Add 'OFSFDL' to additional license ids list

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

commit eeacb2e9bd02720a28dab6bcab6e425c5d8e80cf
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jan 29 15:41:20 2023 +0000

    Add a little success feedback to vault command

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

commit 1b9b4326058894841d542c3aafbc8e1b0774fac4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jan 29 15:39:17 2023 +0000

    Fix inverted logic in mksetupini error propagation
    
    Fixes: d77b94da7803 ("Propagate any error reading packages through mksetupini")


Diff:
---
 calm/hint.py       | 1 +
 calm/mksetupini.py | 2 +-
 calm/vault.py      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/calm/hint.py b/calm/hint.py
index 1ec86d9..28a81b0 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -38,6 +38,7 @@ else:
     json = license_expression.get_license_index()
     extra_licenses = [
         'Linux-man-pages-copyleft',  # requires SPDX license-list 3.15
+        'OFSFDL',                    # "Old FSF documentation license"
         'Public-Domain',
     ]
     for l in extra_licenses:
diff --git a/calm/mksetupini.py b/calm/mksetupini.py
index 9e3a006..41e7535 100755
--- a/calm/mksetupini.py
+++ b/calm/mksetupini.py
@@ -50,7 +50,7 @@ def do_main(args):
     # build package list
     packages, error = package.read_packages(args.rel_area, args.arch)
 
-    if not error:
+    if error:
         logging.error("errors reading package set, not writing setup.ini")
         return 1
 
diff --git a/calm/vault.py b/calm/vault.py
index 76cb8ad..b433660 100644
--- a/calm/vault.py
+++ b/calm/vault.py
@@ -44,6 +44,7 @@ def vault(pvr):
     args.htdocs = os.path.join(common_constants.HTDOCS, 'packages')
 
     db.vault_request_add(args, p, vr)
+    logging.info("package '%s' version '%s' marked as expirable" % (p, vr))
 
 
 def main():