summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-11-10 14:50:39 +0100
committerGitHub <noreply@github.com>2022-11-10 14:50:39 +0100
commit1383d7bbeb06d14ae17bcb917c524a0c17682d3a (patch)
treee95ab85e187a56c693e8b111aee03921220e357f
parent8ca78146bf4cb02dd5b3e8aa51b750bd13805e1a (diff)
parentb41e53472e045345ce28eacd2d9d1278771448d2 (diff)
Merge pull request #24822 from vespa-engine/arnej/allow-no-default-env
allow non-existing default-env.txt
-rw-r--r--client/go/vespa/load_env.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/go/vespa/load_env.go b/client/go/vespa/load_env.go
index c8f66b4fc24..7c42c6d4728 100644
--- a/client/go/vespa/load_env.go
+++ b/client/go/vespa/load_env.go
@@ -6,6 +6,7 @@ package vespa
import (
"bufio"
+ "errors"
"fmt"
"os"
"strings"
@@ -71,6 +72,9 @@ func loadDefaultEnvTo(r loadEnvReceiver) error {
vespaHome := FindHome()
f, err := os.Open(vespaHome + defEnvTxt)
if err != nil {
+ if errors.Is(err, os.ErrNotExist) {
+ return nil
+ }
return err
}
defer f.Close()