[ARVADOS] updated: 2.1.0-1241-gadc1cd036

[Git user]

Summary of changes:
 lib/crunchrun/singularity.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  adc1cd0362bb9fd201b8c470eaf816ca5c212c72 (commit)
      from  22d2299b6d6280726c9692b72e2109a4fa768969 (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 adc1cd0362bb9fd201b8c470eaf816ca5c212c72
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Aug 25 13:01:45 2021 -0400

    17755: Fix os.Stat
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 74e570bab..61fecad0a 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -142,9 +142,10 @@ func (e *singularityExecutor) LoadImage(dockerImageID string, imageTarballPath s
 	}
 
 	if _, err := os.Stat(imageFilename); os.IsNotExist(err) {
-		// Make sure the docker image is readable
-		if _, err := os.Stat(dockerImageID); err != nil {
-			return err;
+		// Make sure the docker image is readable, and error
+		// out if not.
+		if _, err := os.Stat(imageTarballPath); err != nil {
+			return err
 		}
 
 		e.logf("building singularity image")

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


hooks/post-receive
--