projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18947-githttpd'
[arvados.git]
/
lib
/
config
/
deprecated.go
diff --git
a/lib/config/deprecated.go
b/lib/config/deprecated.go
index d53e7ae34096363f5f22c810d02d2da75c682f58..c0a7921b36fdef66112591b18d450d11383afb50 100644
(file)
--- a/
lib/config/deprecated.go
+++ b/
lib/config/deprecated.go
@@
-535,7
+535,7
@@
func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
return nil
}
var oc oldGitHttpdConfig
return nil
}
var oc oldGitHttpdConfig
- err := ldr.loadOldConfigHelper("arv-git-httpd", ldr.GitHttpdPath, &oc)
+ err := ldr.loadOldConfigHelper("arv
ados
-git-httpd", ldr.GitHttpdPath, &oc)
if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath {
return nil
} else if err != nil {
if os.IsNotExist(err) && ldr.GitHttpdPath == defaultGitHttpdConfigPath {
return nil
} else if err != nil {