[whimsy] branch master updated: Check can read signer files

[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 bb15bdd  Check can read signer files
bb15bdd is described below

commit bb15bdd2a731ecec5b54fc0eab79c42c072a2f7f
Author: Sebb <se...@apache.org>
AuthorDate: Fri Jun 26 11:15:35 2020 +0100

    Check can read signer files
    
    Not true that err can be non-null, but still good to check output instead
---
 www/officers/coi.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index af71dc3..066d2b9 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -25,6 +25,7 @@ IDS = (chairs.flatten + ASF::Service['board'].members.map(&:id)).uniq
 
 # Get the list of files in this year's directory
 signerfileslist, err = ASF::SVN.svn('list', COI_CURRENT_URL, {user: $USER, password: $PASSWORD})
+raise RuntimeError.new(err) unless signerfileslist
 signerfiles = signerfileslist.split('\n')
 
 # Create the hash of {signer: signerurl} and remember user's affirmation file
@@ -68,7 +69,6 @@ def get_affirmed_template(user, password, name, timestamp)
        Metadata: _______________Whimsy www/officers/coi.cgi________________'
   template, err =
     ASF::SVN.svn('cat', COI_CURRENT_TEMPLATE_URL, {user: $USER, password: $PASSWORD})
-  # Need to check output for nil rather than err as err may contain text even on success
   raise RuntimeError.new("Failed to read current template.txt -- %s" % err) unless template
   centered_name = "#{name}".center(60, '_')
   centered_date ="#{timestamp}".center(61, '_')