whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Allow override of trademarks phrase if it looks good
Date Mon, 01 May 2017 22:04:30 GMT
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  8e2028d   Allow override of trademarks phrase if it looks good
8e2028d is described below

commit 8e2028d550f17b7dc07aa1bd5d34c73e12bac1e3
Author: Sebb <sebb@apache.org>
AuthorDate: Mon May 1 23:04:28 2017 +0100

    Allow override of trademarks phrase if it looks good
---
 tools/site-scan.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 55d3ec0..eb82d7d 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -93,7 +93,8 @@ def parse(site, name)
 
     txt = squash(node.text)
 
-    if txt =~ /\btrademarks\b/ and not data[:trademarks]
+    # allow override if phrase looks good
+    if (txt =~ /\btrademarks\b/  and not data[:trademarks]) or txt =~/are trademarks of [Tt]he
Apache Software/
       t, p = getText(txt, node)
       # drop previous text if it looks like Copyright sentence
       data[:trademarks] = t.sub(/^.*?Copyright .+? Foundation[.]?/,'').strip

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message