(whimsy) branch master updated: Avoid failure

2024-04-03 Thread sebb
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 60cf7144 Avoid failure
60cf7144 is described below

commit 60cf7144d880b7eda4d14924dc04a4dcba12b9bb
Author: Sebb 
AuthorDate: Wed Apr 3 17:03:52 2024 +0100

Avoid failure
---
 tools/download_check.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/download_check.rb b/tools/download_check.rb
index d5360077..b62d3135 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -579,7 +579,8 @@ def _checkDownloadPage(path, tlp, version)
   else
 E "Bug: found hash #{h} for missing artifact #{stem}"
   end
-  t.sub!('➚', '').strip! # age
+  t.sub!('➚', '') # age
+  t.strip!
   next if t == '' # empire-db
   tmp = text2ext(t)
   next if ext == tmp # i.e. link is just the type or [TYPE]



[whimsy] branch master updated: Avoid failure if uid has no ICLA

2020-05-28 Thread sebb
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 1eccd1f  Avoid failure if uid has no ICLA
1eccd1f is described below

commit 1eccd1fe19bc93a83eaea36cf5a59bd4c000d4b5
Author: Sebb 
AuthorDate: Thu May 28 12:41:49 2020 +0100

Avoid failure if uid has no ICLA
---
 www/roster/views/actions/fullname.json.rb | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/roster/views/actions/fullname.json.rb 
b/www/roster/views/actions/fullname.json.rb
index 0a71328..09ddb08 100644
--- a/www/roster/views/actions/fullname.json.rb
+++ b/www/roster/views/actions/fullname.json.rb
@@ -77,8 +77,10 @@ if message
 end
 
 # update cache
-person.icla.legal_name = @legalname
-person.icla.name = @publicname
+if person.icla
+  person.icla.legal_name = @legalname
+  person.icla.name = @publicname
+end
 
 # return updated committer info
 _committer Committer.serialize(@userid, env)



[whimsy] branch master updated: Avoid failure if uid has no ICLA

2020-05-28 Thread sebb
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 a6be0b5  Avoid failure if uid has no ICLA
a6be0b5 is described below

commit a6be0b5a20422810df7f3cae3870c12c3b50a67f
Author: Sebb 
AuthorDate: Thu May 28 12:02:41 2020 +0100

Avoid failure if uid has no ICLA
---
 www/roster/views/actions/fullname.json.rb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/roster/views/actions/fullname.json.rb 
b/www/roster/views/actions/fullname.json.rb
index 84f7d2e..0a71328 100644
--- a/www/roster/views/actions/fullname.json.rb
+++ b/www/roster/views/actions/fullname.json.rb
@@ -50,17 +50,17 @@ else
   end
 end
 
-# determine commit message
-if person.icla.legal_name != @legalname
+# determine commit message for updating iclas.txt
+if person.icla && person.icla.legal_name != @legalname
   if person.icla.name != @publicname
 message = "Update legal and public name for #{@userid}"
   else
 message = "Update legal name for #{@userid}"
   end
-elsif person.icla.name != @publicname
+elsif person.icla && person.icla.name != @publicname
   message = "Update public name for #{@userid}"
 else
-  message = nil
+  message = nil # don't update iclas.txt
 end
 
 # update iclas.txt