[ARVADOS] updated: 2.1.0-541-g858af9a6b

[Git user]

Summary of changes:
 lib/deduplicationreport/report.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

  discards  85031271810fd64f93a4a92c8663d59531d12b73 (commit)
       via  858af9a6b965b39d5abb7f779b9d082528c88a2b (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (85031271810fd64f93a4a92c8663d59531d12b73)
            \
             N -- N -- N (858af9a6b965b39d5abb7f779b9d082528c88a2b)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 858af9a6b965b39d5abb7f779b9d082528c88a2b
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Mar 31 08:10:06 2021 -0400

    17503: implement review feedback.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/deduplicationreport/command.go b/lib/deduplicationreport/command.go
index 2fdf221b0..c9886d697 100644
--- a/lib/deduplicationreport/command.go
+++ b/lib/deduplicationreport/command.go
@@ -18,7 +18,8 @@ type command struct{}
 type NoPrefixFormatter struct{}
 
 func (f *NoPrefixFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	return []byte(entry.Message), nil
+
+	return []byte(entry.Message + "\n"), nil
 }
 
 // RunCommand implements the subcommand "deduplication-report <collection> <collection> ..."
diff --git a/lib/deduplicationreport/report.go b/lib/deduplicationreport/report.go
index 8109b5dbd..a37be6aab 100644
--- a/lib/deduplicationreport/report.go
+++ b/lib/deduplicationreport/report.go
@@ -29,7 +29,7 @@ func deDuplicate(inputs []string) (trimmed []string) {
 	return
 }
 
-func parseFlags(prog string, args []string, logger *logrus.Logger, stderr io.Writer) (exitcode int, inputs []string) {
+func parseFlags(prog string, args []string, logger *logrus.Logger, stderr io.Writer) ([]string, error) {
 	flags := flag.NewFlagSet("", flag.ContinueOnError)
 	flags.SetOutput(stderr)
 	flags.Usage = func() {
@@ -69,27 +69,26 @@ Options:
 	loglevel := flags.String("log-level", "info", "logging level (debug, info, ...)")
 	err := flags.Parse(args)
 	if err == flag.ErrHelp {
-		return 1, inputs
+		return nil, err
 	} else if err != nil {
-		return 2, inputs
+		return nil, err
 	}
 
-	inputs = flags.Args()
+	inputs := flags.Args()
 
 	inputs = deDuplicate(inputs)
 
 	if len(inputs) < 1 {
-		logger.Errorf("Error: no collections provided")
-		flags.Usage()
-		return 2, inputs
+		err = fmt.Errorf("Error: no collections provided")
+		return inputs, err
 	}
 
 	lvl, err := logrus.ParseLevel(*loglevel)
 	if err != nil {
-		return 2, inputs
+		return inputs, err
 	}
 	logger.SetLevel(lvl)
-	return
+	return inputs, err
 }
 
 func blockList(collection arvados.Collection) (blocks map[string]int) {
@@ -103,15 +102,16 @@ func blockList(collection arvados.Collection) (blocks map[string]int) {
 }
 
 func report(prog string, args []string, logger *logrus.Logger, stdout, stderr io.Writer) (exitcode int) {
-
 	var inputs []string
-	exitcode, inputs = parseFlags(prog, args, logger, stderr)
-	if exitcode != 0 {
-		if exitcode == 1 {
-			// Asking for the cli help should not result in a non-zero exit code
-			exitcode = 0
+	var err error
+
+	inputs, err = parseFlags(prog, args, logger, stderr)
+	if err != nil {
+		if err != flag.ErrHelp {
+			logger.Errorf(err.Error())
+			return 2
 		}
-		return
+		return 0
 	}
 
 	// Arvados Client setup

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


hooks/post-receive
--