This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new cdd9421 Oops, some more fixes
cdd9421 is described below
commit cdd942124097d189e56aaed5cc8e7f06f77d56e1
Author: Sebb <[email protected]>
AuthorDate: Tue Mar 22 12:22:57 2022 +0000
Oops, some more fixes
---
lib/test/svn/apmail_bin/mail_list_autosub.yml | 37 +++++++++++++++------------
lib/whimsy/asf/mail.rb | 20 ++++++++-------
2 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/lib/test/svn/apmail_bin/mail_list_autosub.yml
b/lib/test/svn/apmail_bin/mail_list_autosub.yml
index 2ecfa1e..c711f54 100644
--- a/lib/test/svn/apmail_bin/mail_list_autosub.yml
+++ b/lib/test/svn/apmail_bin/mail_list_autosub.yml
@@ -1,30 +1,35 @@
# Partial listing - TBC
# ASF committers can subscribe to these:
:committers:
-- committers-cvs
-- infra-users
-- jobs
-- party
-- site-cvs
-- site-dev
+- [email protected]
+- [email protected]
+- [email protected]
+- [email protected]
+- [email protected]
+- [email protected]
# In addition to the above, PMC chairs can subscribe:
:chairs:
-- board
-- board-commits
-- board-chat
+- [email protected]
+- [email protected]
+- [email protected]
# In addition to the above, ASF members can subscribe:
:members:
-- members
-- press
+- [email protected]
+- [email protected]
+
+# automatically maintained
+:intrinsic:
+- [email protected]
+- [email protected]
# not auto-subscribable
:disallowed:
-- notallowed
+- [email protected]
:deprecated:
-- deltacloud-commits
-- deltacloud-dev
-- deltacloud-user
-- shindig-users
+- [email protected]
+- [email protected]
+- [email protected]
+- [email protected]
diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb
index 5be2a40..e2dd4d6 100644
--- a/lib/whimsy/asf/mail.rb
+++ b/lib/whimsy/asf/mail.rb
@@ -89,25 +89,26 @@ module ASF
def self.cansub(member, pmc_chair, ldap_pmcs, lidonly = true)
allowed = []
parse_flags do |dom, list, f|
- lid = _autosubid(dom, list)
- next if self._deprecated.include? lid # deprecated in lid format
currently
- next if self._cannot_sub.include? lid # probably unnecessary
+ autoid = _autosubid(dom, list)
+ next if self._deprecated.include? autoid
+ next if self._cannot_sub.include? autoid
+ lid = archivelistid(dom, list)
cansub = false
modsub = isModSub?(f)
if not modsub # subs not moderated; allow all
cansub = true
- elsif self._committers_allowed().include?(lid) # always allowed
+ elsif self._committers_allowed().include?(autoid) # always allowed
cansub = true
else # subs are moderated
if member
- if list == 'private' or self._members_allowed.include?(lid)
+ if list == 'private' or self._members_allowed.include?(autoid)
cansub = true
end
elsif ldap_pmcs and list == 'private' and ldap_pmcs.include?
dom.sub('.apache.org', '')
cansub = true
end
- if pmc_chair and self._chairs_allowed.include? lid
+ if pmc_chair and self._chairs_allowed.include? autoid
cansub = true
end
end
@@ -130,9 +131,10 @@ module ASF
def self.canmod(ldap_pmcs, lidonly = true)
allowed = []
parse_flags do |dom, list, _|
- lid = _autosubid(dom, list)
- next if self._deprecated.include? lid # deprecated in lid format
currently
- next if self._cannot_sub.include? lid # probably unnecessary
+ autoid = _autosubid(dom, list)
+ next if self._deprecated.include? autoid
+ next if self._cannot_sub.include? autoid
+ lid = archivelistid(dom, list)
if ldap_pmcs.include? dom.sub('.apache.org', '')
if lidonly
