https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=e8fa4d84eb7fd1547bdf4bc63681c096b20ce147 commit e8fa4d84eb7fd1547bdf4bc63681c096b20ce147 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Wed Sep 7 14:39:35 2022 +0100 Make 'unmaintained' pseudo-category more accurate https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=76ac02f65feb240a8f4d2eef110533c31e7417e3 commit 76ac02f65feb240a8f4d2eef110533c31e7417e3 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Tue Sep 6 18:51:34 2022 +0100 mkgitolite: Limit branch names maintainer can create/fast-forward Limit the branch names a package maintainer can create/fast-forward to just 'master' (and 'playground'), to avoid a 'git push' to 'typoed-branch-name' succeeding. Diff: --- calm/mkgitoliteconf.py | 2 +- calm/package.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calm/mkgitoliteconf.py b/calm/mkgitoliteconf.py index 7b52dea..3c7f53f 100755 --- a/calm/mkgitoliteconf.py +++ b/calm/mkgitoliteconf.py @@ -94,7 +94,7 @@ def do_main(args): print("repo git/cygwin-packages/%s" % (p)) print("C = %s @leads" % (users)) - print("RW = %s" % (users)) + print("RW master$ = %s" % (users)) print("owner = %s" % (owner)) print("") diff --git a/calm/package.py b/calm/package.py index 7d68856..1c658e1 100755 --- a/calm/package.py +++ b/calm/package.py @@ -1000,9 +1000,9 @@ def validate_package_maintainers(args, packages): logging.error("package '%s' is not obsolete, but has no maintainer" % (p)) error = True - if 'ORPHANED' in pkg_maintainers[packages[p].orig_name]: - # note orphaned packages - packages[p].orphaned = True + if 'ORPHANED' in pkg_maintainers[es_pn]: + # note orphaned packages + packages[p].orphaned = True return error