[ARVADOS] updated: 1.3.0-3228-g72f669602

Git user git at public.arvados.org
Sun Sep 27 02:09:30 UTC 2020


Summary of changes:
 lib/cloud/cloudtest/tester.go   | 3 +--
 sdk/go/keepclient/keepclient.go | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

       via  72f669602572eeccb7d251df669bcfbe63b137d2 (commit)
      from  22e3ec0b8647ba1236d1f0e0cd55dcdb4cca7702 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 72f669602572eeccb7d251df669bcfbe63b137d2
Author: Ward Vandewege <ward at curii.com>
Date:   Sat Sep 26 22:09:06 2020 -0400

    Fix more golint warnings.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/cloud/cloudtest/tester.go b/lib/cloud/cloudtest/tester.go
index 087aceffa..9fd7c9e74 100644
--- a/lib/cloud/cloudtest/tester.go
+++ b/lib/cloud/cloudtest/tester.go
@@ -150,9 +150,8 @@ func (t *tester) Run() bool {
 			if time.Now().After(bootDeadline) {
 				t.Logger.Error("timed out")
 				return false
-			} else {
-				t.sleepSyncInterval()
 			}
+			t.sleepSyncInterval()
 		}
 		t.Logger.WithField("Instance", t.testInstance.ID()).Info("new instance appeared")
 		t.showLoginInfo()
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index b18d7e046..13f8f9577 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -290,10 +290,9 @@ func (kc *KeepClient) getOrHead(method string, locator string, header http.Heade
 					Hash:   md5.New(),
 					Check:  locator[0:32],
 				}, expectLength, url, resp.Header, nil
-			} else {
-				resp.Body.Close()
-				return nil, expectLength, url, resp.Header, nil
 			}
+			resp.Body.Close()
+			return nil, expectLength, url, resp.Header, nil
 		}
 		serversToTry = retryList
 	}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list