projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22d2299
)
17755: Fix os.Stat
author
Peter Amstutz <peter.amstutz@curii.com>
Wed, 25 Aug 2021 17:01:45 +0000
(13:01 -0400)
committer
Peter Amstutz <peter.amstutz@curii.com>
Wed, 25 Aug 2021 17:01:45 +0000
(13:01 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
lib/crunchrun/singularity.go
patch
|
blob
|
history
diff --git
a/lib/crunchrun/singularity.go
b/lib/crunchrun/singularity.go
index 74e570bab94d1510d04eb3d6078d9b775b7f7ea8..61fecad0a13c06664890a9cf2dfffb8346b7a47e 100644
(file)
--- 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")