[whimsy] branch master updated: Fixes #138

[rubys]

This is an automated email from the ASF dual-hosted git repository.

rubys 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 14207ff  Fixes #138
14207ff is described below

commit 14207ff3a8ef24adce75ddfd911de06efa1376af
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Mar 22 00:08:32 2022 -0400

    Fixes #138
---
 www/members/proxy.cgi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index cb94071..bc3bf30 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -217,9 +217,12 @@ def emit_post(cur_mtg_dir, meeting, _)
       Dir.chdir(tmpdir) do
         # write proxy form
         filename = "proxies-received/#$USER.txt"
+        update_existing_form = File.exist? filename
         File.write(filename, proxyform)
-        ASF::SVN.svn_('add', filename, _)
-        ASF::SVN.svn_('propset', ['svn:mime-type', 'text/plain; 
charset=utf-8', filename], _)
+        unless update_existing_form
+          ASF::SVN.svn_('add', filename, _)
+          ASF::SVN.svn_('propset', ['svn:mime-type', 'text/plain; 
charset=utf-8', filename], _)
+        end
 
         # get a list of proxies
         list = Dir['proxies-received/*.txt'].map do |file|
@@ -247,6 +250,8 @@ def emit_post(cur_mtg_dir, meeting, _)
         existing = proxies.scan(/   \S.*\(\S+\).*$/)
         # extract the ids
         existing_ids = existing.map {|line| line[/\((\S+)\)/, 1] }
+        # ensure this id is not treated as previously existing
+        existing_ids.delete(user.id)
         # keep only new ids
         added = list.
           reject {|line| existing_ids.include? line[/\((\S+)\)$/, 1]}