[ARVADOS] updated: 1.3.0-2772-gc9e9f6ff4

[Git user]

Summary of changes:
 lib/deduplicationreport/report.go      | 10 +++++-----
 lib/deduplicationreport/report_test.go |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

       via  c9e9f6ff4cadaf30657becdb70d0d828965397b0 (commit)
      from  544d7aae0d58a25e8c761c638167c3564de06af5 (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 c9e9f6ff4cadaf30657becdb70d0d828965397b0
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Jul 13 09:25:11 2020 -0400

    16573: address a few more review comments.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/deduplicationreport/report.go b/lib/deduplicationreport/report.go
index 663e73427..8bb3fc4e5 100644
--- a/lib/deduplicationreport/report.go
+++ b/lib/deduplicationreport/report.go
@@ -81,7 +81,7 @@ Options:
 	inputs = deDuplicate(inputs)
 
 	if len(inputs) < 1 {
-		logger.Errorf("Error: no collections provided\n")
+		logger.Errorf("Error: no collections provided")
 		flags.Usage()
 		return 2, inputs
 	}
@@ -115,7 +115,7 @@ func report(prog string, args []string, loader *config.Loader, logger *logrus.Lo
 	// Arvados Client setup
 	arv, err := arvadosclient.MakeArvadosClient()
 	if err != nil {
-		logger.Errorf("Error creating Arvados object: %s\n", err)
+		logger.Errorf("Error creating Arvados object: %s", err)
 		exitcode = 1
 		return
 	}
@@ -142,7 +142,7 @@ func report(prog string, args []string, loader *config.Loader, logger *logrus.Lo
 			uuid = input
 		}
 		if !strings.Contains(uuid, "-4zz18-") {
-			logger.Errorf("Error: uuid must refer to collection object\n")
+			logger.Errorf("Error: uuid must refer to collection object")
 			exitcode = 1
 			return
 		}
@@ -157,14 +157,14 @@ func report(prog string, args []string, loader *config.Loader, logger *logrus.Lo
 			var collection arvados.Collection
 			err = arv.Get("collections", uuid, nil, &collection)
 			if err != nil {
-				logger.Errorf("Error: unable to retrieve collection: %s\n", err)
+				logger.Errorf("Error: unable to retrieve collection: %s", err)
 				exitcode = 1
 				return
 			}
 			blocks[uuid] = make(map[string]int)
 			blocks[uuid] = blockList(collection)
 			if pdh != "" && collection.PortableDataHash != pdh {
-				logger.Errorf("Error: the collection with UUID %s has PDH %s, but a different PDH was provided in the arguments: %s\n", uuid, collection.PortableDataHash, pdh)
+				logger.Errorf("Error: the collection with UUID %s has PDH %s, but a different PDH was provided in the arguments: %s", uuid, collection.PortableDataHash, pdh)
 				exitcode = 1
 				return
 			}
diff --git a/lib/deduplicationreport/report_test.go b/lib/deduplicationreport/report_test.go
index dc760f78a..a4ed46606 100644
--- a/lib/deduplicationreport/report_test.go
+++ b/lib/deduplicationreport/report_test.go
@@ -40,7 +40,6 @@ func (*Suite) TestTwoIdenticalUUIDs(c *check.C) {
 	// Run dedupreport with 2 identical uuids
 	exitcode := Command.RunCommand("deduplicationreport.test", []string{arvadostest.FooCollection, arvadostest.FooCollection}, &bytes.Buffer{}, &stdout, &stderr)
 	c.Check(exitcode, check.Equals, 0)
-	//c.Check(stdout.String(), check.Equals, "")
 	c.Check(stdout.String(), check.Matches, "(?ms).*Collections:[[:space:]]+1.*")
 	c.Check(stdout.String(), check.Matches, "(?ms).*Nominal size of stored data:[[:space:]]+3 bytes \\(3 B\\).*")
 	c.Check(stdout.String(), check.Matches, "(?ms).*Actual size of stored data:[[:space:]]+3 bytes \\(3 B\\).*")

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


hooks/post-receive
--