You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/06/26 12:35:23 UTC
[whimsy] branch master updated: Ensure errors are reported to screen
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 59fe110 Ensure errors are reported to screen
59fe110 is described below
commit 59fe1109217c7104dd4e6f2863bce8a9372db997
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jun 26 13:35:14 2020 +0100
Ensure errors are reported to screen
---
www/officers/coi.cgi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index c054519..51acf1a 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -56,7 +56,7 @@ PANEL_MESSAGE = USER_IS_REQUIRED_BUT_NOT_AFFIRMED ?
'Thank you for signing the Conflict of Interest Affirmation'
# Read the template and append the signature block
-def get_affirmed_template(name, timestamp)
+def get_affirmed_template(name, timestamp, _)
signature_block =
' I, the undersigned, acknowledge that I have received,
read and understood the Conflict of Interest policy;
@@ -68,7 +68,7 @@ def get_affirmed_template(name, timestamp)
Date: __
Metadata: _______________Whimsy www/officers/coi.cgi________________'
template, err =
- ASF::SVN.svn('cat', COI_CURRENT_TEMPLATE_URL, {user: $USER.dup.untaint, password: $PASSWORD.dup.untaint})
+ ASF::SVN.svn_!('cat', COI_CURRENT_TEMPLATE_URL, _, {user: $USER.dup.untaint, password: $PASSWORD.dup.untaint})
raise RuntimeError.new("Failed to read current template.txt -- %s" % err) unless template
centered_name = "#{name}".center(60, '_')
centered_date ="#{timestamp}".center(61, '_')
@@ -124,7 +124,7 @@ _html do
if _.get?
if USER_IS_REQUIRED_BUT_NOT_AFFIRMED
_whimsy_panel(PANEL_MESSAGE, style: 'panel-success') do
- affirmed = get_affirmed_template(USERNAME, current_timestamp)
+ affirmed = get_affirmed_template(USERNAME, current_timestamp, _)
affirmed.each_line do |line|
_p line
end
@@ -155,7 +155,7 @@ def emit_post(_)
# The only information in the POST is $USER and $PASSWORD
current_timestamp = DateTime.now.strftime "%Y-%m-%d %H:%M:%S"
- affirmed = get_affirmed_template(USERNAME, current_timestamp)
+ affirmed = get_affirmed_template(USERNAME, current_timestamp, _)
user_filename = "#{USERID}.txt".untaint
# report on commit