[ARVADOS] updated: 2.1.0-221-gd5daf2f71

Git user git at public.arvados.org
Tue Dec 22 08:26:39 UTC 2020


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

       via  d5daf2f717d4021aec77e6cd7d36bcd9b849958e (commit)
      from  e1eba75fd362aadc5119e6bebb5efe05ad46d6db (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 d5daf2f717d4021aec77e6cd7d36bcd9b849958e
Author: Tom Clegg <tom at curii.com>
Date:   Tue Dec 22 03:25:51 2020 -0500

    17014: Un-obfuscate.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index ba6fba3ee..730185c19 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -621,7 +621,7 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 		return fmt.Errorf("output path does not correspond to a writable mount point")
 	}
 
-	if wantAPI := runner.Container.RuntimeConstraints.API; needCertMount && wantAPI {
+	if needCertMount && runner.Container.RuntimeConstraints.API {
 		for _, certfile := range arvadosclient.CertFiles {
 			_, err := os.Stat(certfile)
 			if err == nil {
@@ -1092,7 +1092,7 @@ func (runner *ContainerRunner) CreateContainer() error {
 		},
 	}
 
-	if wantAPI := runner.Container.RuntimeConstraints.API; wantAPI {
+	if runner.Container.RuntimeConstraints.API {
 		tok, err := runner.ContainerToken()
 		if err != nil {
 			return err
@@ -1269,7 +1269,7 @@ func (runner *ContainerRunner) updateLogs() {
 // CaptureOutput saves data from the container's output directory if
 // needed, and updates the container output accordingly.
 func (runner *ContainerRunner) CaptureOutput() error {
-	if wantAPI := runner.Container.RuntimeConstraints.API; wantAPI {
+	if runner.Container.RuntimeConstraints.API {
 		// Output may have been set directly by the container, so
 		// refresh the container record to check.
 		err := runner.DispatcherArvClient.Get("containers", runner.Container.UUID,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list