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 c5fabda WHIMSY-378 - minotaur has been retired
c5fabda is described below
commit c5fabda3ba74975d7e39051715a9d6d38c226992
Author: Sebb <[email protected]>
AuthorDate: Wed Feb 9 23:09:04 2022 +0000
WHIMSY-378 - minotaur has been retired
Drop references to .archives file
---
lib/whimsy/asf/mail.rb | 31 +------------------------------
lib/whimsy/asf/mlist.rb | 2 +-
repository.yml | 1 -
www/test/dataflow.json | 5 -----
4 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb
index 2282def..b3bb3be 100644
--- a/lib/whimsy/asf/mail.rb
+++ b/lib/whimsy/asf/mail.rb
@@ -41,35 +41,6 @@ module ASF
list
end
- # Parse the .archives file to get the list names
- def self._load_lists
- apmail_bin = ASF::SVN['apmail_bin']
- file = File.join(apmail_bin, '.archives')
- if not @lists or File.mtime(file) != @list_mtime
- lists = Hash[File.read(file).scan(
- /^\s+"(\w[-\w]+)", "\/home\/apmail\/(public|private)-arch\//
- )]
- # Drop the infra test lists
- lists.delete_if {|list| list =~ /-infra-[a-z]$/ or list ==
'incubator-infra-dev' }
- @lists = lists
- @list_mtime = File.mtime(file)
- end
- end
-
- # get a list of all mailing lists. If <tt>public_private</tt> is
- # <tt>false</tt> this will be a simple list. If <tt>public_private</tt> is
- # <tt>true</tt>, return a Hash where the values are either <tt>public</tt>
- # or <tt>private</tt>.
- def self.lists(public_private=false)
- Mail._load_lists
- public_private ? @lists : @lists.keys
- end
-
- def self.list_mtime
- Mail._load_lists
- @list_mtime
- end
-
# list of mailing lists that aren't actively seeking new subscribers
def self.deprecated
self._load_auto()
@@ -200,7 +171,7 @@ module ASF
self.qmail_ids.include? id
end
- # Convert list name to form used in bin/.archives
+ # Convert list name to form used in mail_list_autosub.yml
def self.archivelistid(dom, list)
return "apachecon-#{list}" if dom == 'apachecon.com'
return list if dom == 'apache.org'
diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index 624f042..341fe3d 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -262,7 +262,7 @@ module ASF
private
# return the archiver type as array:
[:MBOX|:PONY|:MINO|:MAIL_ARCH|:MARKMAIL|:WHIMSY,
'public'|'private'|'alias'|'direct']
- # minotaur archiver names do not include any public/private indication as
that is in bin/.archives
+ # minotaur archiver names do not include any public/private indication
def self.archiver_type(email, dom, list)
case email
when ARCH_MBOX_PUB then return [:MBOX, 'public']
diff --git a/repository.yml b/repository.yml
index dbeaabc..58412da 100644
--- a/repository.yml
+++ b/repository.yml
@@ -44,7 +44,6 @@
url: infra/infrastructure/apmail/trunk/bin
depth: empty
files:
- - .archives
- mail_list_autosub.yml
attic-xdocs:
diff --git a/www/test/dataflow.json b/www/test/dataflow.json
index 9aa7a84..143906b 100644
--- a/www/test/dataflow.json
+++ b/www/test/dataflow.json
@@ -181,7 +181,6 @@
"description": "ASF::Mail: Associate email addresses with Persons; See
also ASF::Config, Person, Committee, Podling",
"maintainer": "vp-whimsy",
"sources": [
- "infra/infrastructure/apmail/trunk/bin/.archives"
]
},
"/lib/whimsy/asf/member.rb": {
@@ -256,10 +255,6 @@
"description": "Core infrastructure data locations",
"maintainer": "infra-staff"
},
- "infra/infrastructure/apmail/trunk/bin/.archives": {
- "description": "Records about mail archives and emails",
- "maintainer": "infra-staff"
- },
"private/foundation/members.txt": {
"description": "Official record of ASF corporate Membership",
"maintainer": "secretary"
