direktil/local-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Mikaël Cluseau
2019-03-01 12:37:51 +11:00
parent ea6fce68e1
commit e6d281e1ae
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/clustersconfig/defaults.go
View File

@ -6,6 +6,7 @@ import (
"io/ioutil"
"log"
"path"
"path/filepath"
"strings"
billy "gopkg.in/src-d/go-billy.v4"
@ -75,7 +76,9 @@ func (d *Defaults) Open(rev, filePath string) (rd io.Reader, err error) {
}
file, err := tree.File(filePath)
if err != nil {
if err == object.ErrFileNotFound {
return nil, nil
} else if err != nil {
return
}
@ -84,6 +87,9 @@ func (d *Defaults) Open(rev, filePath string) (rd io.Reader, err error) {
func (d *Defaults) ReadAll(rev, filePath string) (ba []byte, err error) {
rd, err := d.Open(rev, filePath)
if err != nil || rd == nil {
return
}
return ioutil.ReadAll(rd)
}
@ -97,7 +103,7 @@ func (d *Defaults) List(rev, dir string) (names []string, err error) {
if !strings.HasSuffix(f.Name, ".yaml") {
return
}
names = append(names, strings.TrimSuffix(f.Name, ".yaml"))
names = append(names, strings.TrimSuffix(filepath.Base(f.Name), ".yaml"))
return
})
return