From adc1cd0362bb9fd201b8c470eaf816ca5c212c72 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 25 Aug 2021 13:01:45 -0400 Subject: [PATCH] 17755: Fix os.Stat Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/crunchrun/singularity.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go index 74e570bab9..61fecad0a1 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") -- 2.30.2