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 2189dba Simplify; fail on error
2189dba is described below
commit 2189dba8fd0af9309b5eda03e99f188f572552b2
Author: Sebb <[email protected]>
AuthorDate: Thu Jul 9 23:18:29 2020 +0100
Simplify; fail on error
---
www/roster/views/actions/memstat.json.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/roster/views/actions/memstat.json.rb
b/www/roster/views/actions/memstat.json.rb
index bedf130..f28c8df 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -56,8 +56,8 @@ end
# Owner operations
if @action == 'rescind_emeritus'
- emeritus_rescinded_url = ASF::SVN.svnurl('emeritus-requests-rescinded')
- ASF::SVN.svn_('mv', [@emeritusfileurl, emeritus_rescinded_url], _, {env:env,
msg:message})
+ # TODO handle case where rescinded file already exists
+ ASF::SVN.svn_!('mv', [@emeritusfileurl,
ASF::SVN.svnurl('emeritus-requests-rescinded')], _, {env:env, msg:message})
elsif @action == 'request_emeritus'
# Create mail to secretary requesting emeritus
template, err =
