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

Jon Turney jturney@sourceware.org
Sun Jan 22 10:54:56 GMT 2023




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

commit de32686b4e712fdc228087c043eef69def82aac8
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jan 22 10:41:39 2023 +0000

    Drop a spurious argument to maintainers.add_packages()
    
    Drop a spurious argument to maintainers.add_packages(), left-over after
    ad6b47c27b11 ("Relax trusted maintainer restrictions").
    
    Also report an error if CYGNAME isn't set.


Diff:
---
 calm/tool_util.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/calm/tool_util.py b/calm/tool_util.py
index 43fe3ea..712b0e2 100644
--- a/calm/tool_util.py
+++ b/calm/tool_util.py
@@ -45,9 +45,12 @@ def split(pvr):
 def permitted(p):
     # check CYGNAME is a maintainer for package
     cygname = os.environ.get('CYGNAME', None)
+    if not cygname:
+        logging.error("who are you?")
+        return False
 
     mlist = {}
-    mlist = maintainers.add_packages(mlist, common_constants.PKGMAINT, trustedMaint=common_constants.TRUSTEDMAINT)
+    mlist = maintainers.add_packages(mlist, common_constants.PKGMAINT)
 
     # CYGNAME is a maintainer for package
     if p in mlist[cygname].pkgs:



More information about the Cygwin-apps-cvs mailing list