Wrong check for Whimsy archiver

apache · Oct 23, 2024 · 3e2acb5 · 3e2acb5
1 parent 2b14ac3
commit 3e2acb5
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
@@ -341,7 +341,7 @@ def self.is_mino_archiver?(e)
 
     # Is the email a Whimsy archiver?
     def self.is_whimsy_archiver?(e)
-      e =~ /@whimsy(-vm\d+)?\.apache\.org$/
+      e =~ /@whimsy[-\da-z]*\.apache\.org$/
     end
 
     # Is the email a markmail archiver?
@@ -449,14 +449,11 @@ def self.list_parse(type, &block)
     ARCH_PONY_PUB = 'archive-asf-public@cust-asf.ponee.io'
     ARCH_PONY_PRV = 'archive-asf-private@cust-asf.ponee.io'
 
-    # Local Whimsy archives
-    ARCH_WHIMSY = %r{\A(board|member)@whimsy[^.]*\.apache\.org\z}
-
     # Standard external archivers (necessarily public)
     ARCH_EXT_MAIL_ARCHIVE = 'archive@mail-archive.com'
     ARCH_EXT_MARKMAIL_RE = %r{^\w+\.\w+\.\w+@.\.markmail\.org$} # one.two.three@a.markmail.org
 
-    ARCHIVERS = [ARCH_PONY_PRV, ARCH_PONY_PUB, ARCH_WHIMSY,
+    ARCHIVERS = [ARCH_PONY_PRV, ARCH_PONY_PUB,
                  ARCH_MBOX_PUB, ARCH_MBOX_PRV, ARCH_MBOX_RST, ARCH_EXT_MAIL_ARCHIVE]
 
     # Private archivers