[arvados] updated: 2.7.0-6266-gbb996d3744

[git repository hosting]

Summary of changes:
 lib/crunchrun/copier.go | 8 ++++++++
 1 file changed, 8 insertions(+)

       via  bb996d3744097bc0d0475ece4530c06b3c2582cf (commit)
      from  ec0b74da392f739d4340b7a9120f2f90f5871f47 (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 bb996d3744097bc0d0475ece4530c06b3c2582cf
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 30 11:37:59 2024 -0400

    12430: Add comments about the two stages of glob-filtering.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/copier.go b/lib/crunchrun/copier.go
index 507029b36e..b411948733 100644
--- a/lib/crunchrun/copier.go
+++ b/lib/crunchrun/copier.go
@@ -79,10 +79,17 @@ func (cp *copier) Copy() (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("error creating Collection.FileSystem: %v", err)
 	}
+
+	// Remove files/dirs that don't match globs (the ones that
+	// were added during cp.walkMount() by copying subtree
+	// manifests into cp.manifest).
 	err = cp.applyGlobsToCollectionFS(collfs)
 	if err != nil {
 		return "", fmt.Errorf("error while removing non-matching files from output collection: %w", err)
 	}
+	// Remove files/dirs that don't match globs (the ones that are
+	// stored on the local filesystem and would need to be copied
+	// in copyFile() below).
 	cp.applyGlobsToFilesAndDirs()
 	for _, d := range cp.dirs {
 		err = collfs.Mkdir(d, 0777)
@@ -90,6 +97,7 @@ func (cp *copier) Copy() (string, error) {
 			return "", fmt.Errorf("error making directory %q in output collection: %v", d, err)
 		}
 	}
+
 	var unflushed int64
 	var lastparentdir string
 	for _, f := range cp.files {

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


hooks/post-receive
--