From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 5EBF13858D32; Sun, 22 Jan 2023 10:54:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EBF13858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674384896; bh=6NtNh+gq2zh2os62dhcgLiR337QAqmSeK0aXy8kaR5A=; h=To:Subject:Date:From:From; b=lYmS7OwNgC560FTPQ66HyzKkHNdmp+cII4FEcYOuCVVCmrz271PXF1fcO2EDFhH9R tu2fBJ9OmdJ0Wpwd6jw+fGR1zNgo4zWRTVf9ryOrVV9DhUE0vcpSvkNQtcmCwzPVvo crNvRnRmI3orJO1tGDqA6Uw5JnQGO6ffLrZzpzeY= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20221205-29-gde32686 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 87009cdc1b35968c61317dfe5375f5126ec44918 X-Git-Newrev: de32686b4e712fdc228087c043eef69def82aac8 Message-Id: <20230122105456.5EBF13858D32@sourceware.org> Date: Sun, 22 Jan 2023 10:54:56 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=de32686b4e712fdc228087c043eef69def82aac8 commit de32686b4e712fdc228087c043eef69def82aac8 Author: Jon Turney 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: