[whimsy] branch master updated: Was in wrong section

[se...@apache.org]

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 d539b34  Was in wrong section
d539b34 is described below

commit d539b34a11b40c4780afda6b7557e3fc49d53892
Author: Sebb <se...@apache.org>
AuthorDate: Tue Jun 22 22:52:47 2021 +0100

    Was in wrong section
---
 www/board/agenda/views/actions/todos.json.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/www/board/agenda/views/actions/todos.json.rb b/www/board/agenda/views/actions/todos.json.rb
index af6fbf9..4b8319b 100644
--- a/www/board/agenda/views/actions/todos.json.rb
+++ b/www/board/agenda/views/actions/todos.json.rb
@@ -142,17 +142,6 @@ if @establish and env.password
 
   establish = @establish.map {|resolution| resolution['name']}
 
-  # update ci.yaml to add retirements
-  if @terminate and env.password
-    yyyymm = datehy[0, 7] # keep only yyyy-mm
-    cinfoy = File.join(ASF::SVN['board'], 'committee-info.yaml')
-    @terminate.each do |resolution|
-      ASF::SVN.update cinfoy, title, env, _ do |_tmpdir, contents|
-        ASF::Committee.record_termination(contents, resolution['name'], yyyymm)
-      end
-    end
-  end
-
   # create 'victims' file for tlpreq tool
   ASF::SVN.svn('update', TLPREQ)
   establish -= Dir[File.join(TLPREQ, "victims-#{date}.*.txt")].
@@ -169,6 +158,17 @@ if @establish and env.password
   end
 end
 
+# update ci.yaml to add retirements
+if @terminate and env.password
+  yyyymm = datehy[0, 7] # keep only yyyy-mm
+  cinfoy = File.join(ASF::SVN['board'], 'committee-info.yaml')
+  @terminate.each do |resolution|
+    ASF::SVN.update cinfoy, title, env, _ do |_tmpdir, contents|
+      ASF::Committee.record_termination(contents, resolution['name'], yyyymm)
+    end
+  end
+end
+
 # update LDAP and send out congratulatory email
 if (@change || @establish) and env.password
   chairs = ASF::Service.find('pmc-chairs')