[ARVADOS] updated: 2.1.0-151-g186d199ed

[Git user]

Summary of changes:
 lib/install/deps.go                    | 4 ++--
 sdk/go/blockdigest/blockdigest_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

       via  186d199ed06554cc5ddbdd7fc9d33622710fff88 (commit)
      from  1dcd10a37c3dd8166ddf06053d895d546f8ad3d4 (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 186d199ed06554cc5ddbdd7fc9d33622710fff88
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Nov 25 17:24:35 2020 -0500

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

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 15ff0607a..342ef03a7 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -293,10 +293,10 @@ rm ${zip}
 			DataDirectory string
 			LogFile       string
 		}
-		if pg_lsclusters, err2 := exec.Command("pg_lsclusters", "--no-header").CombinedOutput(); err2 != nil {
+		if pgLsclusters, err2 := exec.Command("pg_lsclusters", "--no-header").CombinedOutput(); err2 != nil {
 			err = fmt.Errorf("pg_lsclusters: %s", err2)
 			return 1
-		} else if pgclusters := strings.Split(strings.TrimSpace(string(pg_lsclusters)), "\n"); len(pgclusters) != 1 {
+		} else if pgclusters := strings.Split(strings.TrimSpace(string(pgLsclusters)), "\n"); len(pgclusters) != 1 {
 			logger.Warnf("pg_lsclusters returned %d postgresql clusters -- skipping postgresql initdb/startup, hope that's ok", len(pgclusters))
 		} else if _, err = fmt.Sscanf(pgclusters[0], "%s %s %d %s %s %s %s", &pgc.Version, &pgc.Cluster, &pgc.Port, &pgc.Status, &pgc.Owner, &pgc.DataDirectory, &pgc.LogFile); err != nil {
 			err = fmt.Errorf("error parsing pg_lsclusters output: %s", err)
diff --git a/sdk/go/blockdigest/blockdigest_test.go b/sdk/go/blockdigest/blockdigest_test.go
index a9994f704..9e8f9a4a0 100644
--- a/sdk/go/blockdigest/blockdigest_test.go
+++ b/sdk/go/blockdigest/blockdigest_test.go
@@ -13,8 +13,8 @@ import (
 
 func getStackTrace() string {
 	buf := make([]byte, 1000)
-	bytes_written := runtime.Stack(buf, false)
-	return "Stack Trace:\n" + string(buf[:bytes_written])
+	bytesWritten := runtime.Stack(buf, false)
+	return "Stack Trace:\n" + string(buf[:bytesWritten])
 }
 
 func expectEqual(t *testing.T, actual interface{}, expected interface{}) {

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


hooks/post-receive
--