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 3e2acb5f Wrong check for Whimsy archiver
3e2acb5f is described below

commit 3e2acb5f0e9630e2d89a5e307dfc6a1e2532c0f6
Author: Sebb <[email protected]>
AuthorDate: Thu Oct 24 00:29:29 2024 +0100

    Wrong check for Whimsy archiver
---
 lib/whimsy/asf/mlist.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/whimsy/asf/mlist.rb b/lib/whimsy/asf/mlist.rb
index 417a84c8..91e554a5 100644
--- a/lib/whimsy/asf/mlist.rb
+++ b/lib/whimsy/asf/mlist.rb
@@ -341,7 +341,7 @@ module ASF
 
     # 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 @@ module ASF
     ARCH_PONY_PUB = '[email protected]'
     ARCH_PONY_PRV = '[email protected]'
 
-    # Local Whimsy archives
-    ARCH_WHIMSY = %r{\A(board|member)@whimsy[^.]*\.apache\.org\z}
-
     # Standard external archivers (necessarily public)
     ARCH_EXT_MAIL_ARCHIVE = '[email protected]'
     ARCH_EXT_MARKMAIL_RE = %r{^\w+\.\w+\.\w+@.\.markmail\.org$} # 
[email protected]
 
-    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

Reply via email to