[whimsy] branch master updated: Pick up some more owner details

[sebb]

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 506807fb Pick up some more owner details
506807fb is described below

commit 506807fb484f2a38ce3cb781d851a735987c539f
Author: Sebb <s...@apache.org>
AuthorDate: Tue Feb 28 21:44:01 2023 +0000

    Pick up some more owner details
    
    Optionally suppress recent WARN message for easier
    comparison with previous revisions
---
 tools/collate_minutes.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index fa5f6370..04606926 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -41,6 +41,8 @@ force = ARGV.delete '--force' # rerun regardless
 
 NOSTAMP = ARGV.delete '--nostamp' # don't add dynamic timestamp to pages (for 
debug compares)
 
+NOWARN_LAYOUT = ARGV.delete '--nowarn_layout' # don't layout change warning to 
pages (for debug compares)
+
 DUMP_AGENDA = ARGV.delete '--dump_agenda' # output agenda details
 
 STAMP = (NOSTAMP ? Time.new(1970) :  Time.now).strftime '%Y-%m-%d %H:%M'
@@ -295,13 +297,13 @@ seen={}
     end
 
     owners = nil
-    if title =~ /^Report from the VP of (.+)/
+    if title =~ /^Report from the(?: VP of)? (.+)/i
       title = $1
       if title =~ /^(.+?) +\[([^\]]+)\]/
           title = $1
           owners = $2
       end
-    end 
+    end
     title.sub! /Special /, ''
     title.sub! /Requested /, ''
     title.sub! /(^| )Report To The Board( On)?( |$)/i, ''
@@ -790,12 +792,14 @@ def layout(title = nil)
       beginning of every Board meeting; therefore, the list below does not
       normally contain details from the minutes of the most recent Board 
meeting.
       EOT
-      x.br
-      x.br
-      x.strong 'WARNING: these pages may omit some original contents of the 
minutes.'
-      x.br
-      x.text 'This is due to changes in the layout of the source minutes over 
the years.'
-      x.text 'Fixes are being worked on.'
+      unless NOWARN_LAYOUT
+        x.br
+        x.br
+        x.strong 'WARNING: these pages may omit some original contents of the 
minutes.'
+        x.br
+        x.text 'This is due to changes in the layout of the source minutes 
over the years.'
+        x.text 'Fixes are being worked on.'
+      end
     end
   }