projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13647: Suppress "exit status 1" after config-check diff output.
[arvados.git]
/
lib
/
config
/
load.go
diff --git
a/lib/config/load.go
b/lib/config/load.go
index 3ed2b9928f6ef734cf9f739250e0d891d1664727..a0c769537487cce179ff74d65035144ef647b561 100644
(file)
--- a/
lib/config/load.go
+++ b/
lib/config/load.go
@@
-23,6
+23,14
@@
type logger interface {
Warnf(string, ...interface{})
}
Warnf(string, ...interface{})
}
+func loadFileOrStdin(path string, stdin io.Reader, log logger) (*arvados.Config, error) {
+ if path == "-" {
+ return load(stdin, log, true)
+ } else {
+ return LoadFile(path, log)
+ }
+}
+
func LoadFile(path string, log logger) (*arvados.Config, error) {
f, err := os.Open(path)
if err != nil {
func LoadFile(path string, log logger) (*arvados.Config, error) {
f, err := os.Open(path)
if err != nil {