[ARVADOS] updated: 2.1.0-130-g820472b2b

[Git user]

Summary of changes:
 lib/crunchrun/copier.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  b8c4792cd8f020cf489bb4e58410b76eb9f4fa2c (commit)
       via  820472b2b3d92a2092a4074510e06efa3a4f3455 (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 (b8c4792cd8f020cf489bb4e58410b76eb9f4fa2c)
            \
             N -- N -- N (820472b2b3d92a2092a4074510e06efa3a4f3455)

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 820472b2b3d92a2092a4074510e06efa3a4f3455
Author: Ward Vandewege <ward at curii.com>
Date:   Thu May 20 21:17:57 2021 -0400

    17708: when crunch-run encounters an unsupported file type while copying
           the output of a job, do not error out, just print a warning and
           skip the offending file.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/crunchrun/copier.go b/lib/crunchrun/copier.go
index 1b0f168b8..132101028 100644
--- a/lib/crunchrun/copier.go
+++ b/lib/crunchrun/copier.go
@@ -331,8 +331,8 @@ func (cp *copier) walkHostFS(dest, src string, maxSymlinks int, includeMounts bo
 		})
 		return nil
 	}
-
-	return fmt.Errorf("Unsupported file type (mode %o) in output dir: %q", fi.Mode(), src)
+	cp.logger.Printf("Skipping unsupported file type (mode %o) in output dir: %q", fi.Mode(), src)
+	return nil
 }
 
 // Return the host path that was mounted at the given path in the

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


hooks/post-receive
--