[whimsy] branch master updated: emeritus-request has moved

[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 5a43b46  emeritus-request has moved
5a43b46 is described below

commit 5a43b4660cd0664c9f855c1773ad68eec58168e6
Author: Sebb <s...@apache.org>
AuthorDate: Fri Jan 14 13:21:08 2022 +0000

    emeritus-request has moved
---
 repository.yml                           | 1 -
 www/roster/views/actions/memstat.json.rb | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/repository.yml b/repository.yml
index 9773b34..4d30a18 100644
--- a/repository.yml
+++ b/repository.yml
@@ -133,7 +133,6 @@
     files:
       - members.txt
       - potential-member-watch-list.txt
-      - emeritus-request.txt
 
   foundation_board: # The checkout is needed by the WSS service and 
collate_minutes
     url: private/foundation/board
diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index ce3ce56..8fe8c25 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -68,9 +68,9 @@ if @action == 'rescind_emeritus'
   end
 elsif @action == 'request_emeritus'
   # Create emeritus request and send acknowlegement mail from secretary
-  template, err =
-    ASF::SVN.svn('cat', ASF::SVN.svnpath!('foundation', 
'emeritus-request.txt'), {env:env})
-  raise RuntimeError.new("Failed to read emeritus-request.txt: " + err) unless 
template
+  # TODO URL should be a config constant ...
+  code, template = 
ASF::Git.github('apache/www-site/main/content/forms/emeritus-request.txt')
+  raise "Failed to read emeritus-request.txt: " + code unless code == "200"
   centered_id = USERID.center(55, '_')
   centered_name = USERNAME.center(55, '_')
   centered_date = TIMESTAMP.center(55, '_')