[openssl-commits] [tools] master update

[Rich Salz]

The branch master has been updated
       via  22592d8f89f7a2aad00ab36a38ee698840bf258c (commit)
      from  5e7c8fc60ec209e332bf707297c6ac3901d7db3b (commit)


- Log -----------------------------------------------------------------
commit 22592d8f89f7a2aad00ab36a38ee698840bf258c
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun Jul 23 09:31:33 2017 -0400

    Minor tweak to hopefully avoid problem

-----------------------------------------------------------------------

Summary of changes:
 clacheck/clacheck.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/clacheck/clacheck.py b/clacheck/clacheck.py
index 58fdcce..24f844b 100755
--- a/clacheck/clacheck.py
+++ b/clacheck/clacheck.py
@@ -95,18 +95,15 @@ def process():
         print textplain, "patch_url missing"
         return
     missing = {}
-    trivial = 0
     for line in urllib.urlopen(patch_url):
         m = Trivial.match(line)
         if m:
-            trivial = 1
-            continue
+            update_state(pr, SUCCESS, "Trivial")
+            return
         m = From.match(line)
         if m and not have_cla(m.group(1)):
             missing[m.group(1)] = 1
-    if trivial:
-        update_state(pr, SUCCESS, "Trivial")
-    elif len(missing) == 0:
+    if len(missing) == 0:
         update_status(pr, SUCCESS, 'CLA on file')
     else:
         update_status(pr, FAILURE, "CLA missing: " + str(missing.keys()))